Thibaut Girka fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		2019-03-26 16:01:59 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:01:59 +01:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
features
fixtures
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
mailers
models
policies
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01:00
support
validators
views
workers
rails_helper.rb
spec_helper.rb