tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
fdd0beefa7176f4d0df3adcf37156229889127d7
Mastodon/Gemfile
Thibaut Girka fdd0beefa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
2020-04-12 16:50:27 +02:00

4.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink