mastodon/lib
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
..
assets
devise
generators
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
paperclip
tasks
templates