tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
be4849c08306cce930ea27e1f8097ffb774f75c6
Mastodon/Gemfile
Thibaut Girka be4849c083 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00

4.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink