Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
_tag.html.haml	Add batch approve/reject for pending hashtags in admin UI (#11791)	2019-09-09 12:50:09 +02:00
index.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
show.html.haml	Change the hashtag link from WebUI to public page (#11845)	2019-09-15 15:48:00 +02:00