Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +02:00
..
2017-07-18 16:38:22 +02:00
2017-11-18 00:16:48 +01:00
2017-06-19 11:31:37 +02:00
2017-06-19 01:38:50 +02:00
2017-11-18 00:16:48 +01:00
2017-11-27 16:07:59 +01:00
2017-11-18 00:16:48 +01:00
2017-11-18 00:16:48 +01:00
2017-04-05 00:29:56 +02:00