David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss		2018-01-02 00:11:41 -06:00
..
_mixins.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
about.scss	ReFix font-weight of <strong> element for CJK fonts (#5920)	2017-12-07 21:35:19 +01:00
accounts.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
admin.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
basics.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
boost.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
compact_header.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
components.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-02 00:11:41 -06:00
containers.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
emoji_picker.scss	Fix emoji picker scrollbar (regression from #5046) (#5901)	2017-12-06 12:18:27 +01:00
footer.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
forms.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
landing_strip.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
modal.scss	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
reset.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
rtl.scss	Fix layout for RTL (#6014)	2017-12-13 18:28:13 +01:00
stream_entries.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
tables.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
variables.scss	ReFix font-weight of <strong> element for CJK fonts (#5920)	2017-12-07 21:35:19 +01:00