Baptiste Lemoine 03fd10d068 Merge branch 'master' of https://github.com/tootsuite/mastodon into messaging ... ⚡ add snow effect conditionnally # Conflicts: # package.json # yarn.lock		2019-12-23 11:01:09 +01:00
..
fonts	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
images	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02:00
mastodon	Merge branch 'master' of https://github.com/tootsuite/mastodon into messaging	2019-12-23 11:01:09 +01:00
packs	Admin setting to disable default follows (#12566)	2019-12-16 23:55:50 +01:00
styles	split conversation example	2019-12-22 18:48:13 +01:00