Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		2018-06-15 20:51:39 +02:00
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-15 20:51:39 +02:00
containers	Remove trending hashtags (#7711)	2018-06-04 02:18:18 +02:00
util	Upgrade ESLint to version 4.x (#6276)	2018-01-17 16:57:15 +01:00
index.js	Improve getting started column (#7676)	2018-05-30 18:41:47 +02:00