David Yip 5dd2a78034 Merge pull request #528 from glitch-soc/merge-upstream ...

Merge with tootsuite/master

2018-06-03 03:01:09 -05:00

..

core

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

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

flavours

Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null

2018-06-02 16:19:06 -05:00

fonts

…

images

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

locales

…

mastodon

Whoops, forgot to clean up a conflict.

2018-06-03 02:35:54 -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 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00