mastodon/app
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
workers