Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
core	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
flavours	Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements	2018-05-07 09:45:13 -04:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08: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 branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
packs	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
skins	Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables	2018-05-06 11:32:42 -04:00
styles	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00