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
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

..

core

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

flavours

Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation

2018-06-06 23:56:48 -05:00

fonts

…

images

…

locales

…

mastodon

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

packs

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

skins

Port Sylvhem's mastodon-light to glitch flavour

2018-05-07 17:00:02 +02:00

styles

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00