You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.		6 years ago
..
core	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
flavours	Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation	6 years ago
fonts	…
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
locales	…
mastodon	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	6 years ago
packs	Merge branch 'master' into glitch-soc/merge	6 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	7 years ago
styles	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	6 years ago