Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 03:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d10f6036cfeebec5b2c160db8659d2c19d29fe9c
mastodon/app/views/admin/settings
History
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
edit.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-30 12:22:33 +02:00