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
..
2017-11-17 19:29:16 -08:00
2018-07-16 01:11:53 +02:00
2017-11-17 19:29:16 -08:00
2018-04-19 23:35:47 +02:00