tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
65a9b788fc4fc9cf57cee8e8a7cae5dca8f97a5e
Mastodon/app/javascript/styles/mastodon/components.scss
Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
2020-06-17 17:10:15 +02:00

117 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink