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
..
action_bar.js	Add profile options on compose form (#7789)	2018-06-13 14:44:50 +02:00
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-15 20:51:39 +02:00
emoji_picker_dropdown.js	Rename emoji sheet to avoid caching issue (#7777)	2018-06-10 16:12:47 +02:00
navigation_bar.js	Fix "Invalid DOM property `class`" (#7798)	2018-06-14 08:03:07 +02:00
privacy_dropdown.js	…
reply_indicator.js	…
search.js	…
search_results.js	Remove trending hashtags (#7711)	2018-06-04 02:18:18 +02:00
text_icon_button.js	…
upload.js	…
upload_button.js	…
upload_form.js	…
upload_progress.js	…
warning.js	…