David Yip 4b7ceed3f0 Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation ... Use history.state to decide whether we should goBack() or go to / (fixes #247)		2018-06-06 23:56:48 -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	Theme: Windows 95	2017-10-26 23:22:48 -07:00
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
locales	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
mastodon	Merge remote-tracking branch 'origin/master' into gs-master	2018-06-03 19:44:05 -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