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
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
v2
web
base_controller.rb	Allow mods to disable login, improve message when login disabled (#8329)	2018-08-23 23:26:29 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb