Commit Graph

4 Commits

Author SHA1 Message Date
b872c1c7c0 Merge branch 'master' of https://github.com/tootsuite/mastodon
Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>

# Conflicts:
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/features/status/components/action_bar.js
2020-02-12 10:03:28 +01:00
d106a91363 fixs for light style 2020-02-05 17:58:51 +01:00
d7a17f9834 fix some columns show on smaller screens 2020-01-04 16:27:50 +01:00
427a07d83d bliss theme separated 2019-08-27 13:55:47 +02:00