tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
fe1de4e49b2ee6b74139d8ac7811104095c7477b
Mastodon/app/views/admin/settings/edit.html.haml
T
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

6.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink