tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
598cdc9542122b6a8ebe2fbffcff864afdc18853
Mastodon/config/settings.yml
T
Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00

1.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink