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
..
2018-08-23 22:58:25 +02:00
2018-01-05 16:22:58 -08:00
2017-12-10 11:08:04 -08:00