mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-29 09:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/admin/settings
History
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
..
edit.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:01:59 +01:00