Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		2018-12-23 11:28:28 +01:00
..
admin	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
settings
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
flashes_helper.rb
home_helper.rb	Make avatar and headers respect auto_play_gif (#9515)	2018-12-14 20:34:18 +01:00
instance_helper.rb
jsonld_helper.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
routing_helper.rb
settings_helper.rb	Add Czech language option and locale data (#8594)	2018-09-05 08:50:06 +09:00
stream_entries_helper.rb	Move hide_followers_count logic to an helper	2018-12-20 14:51:12 +01:00