tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cf421bafdf644f8c8a44b4f06f82841cbd568cdf
Mastodon/app/views/layouts/public.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

2.0 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink