tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d7eb58005334f1bb38dd70f9538e765aee338480
Mastodon/package.json
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00

5.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink