]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
commit2a7602cad449da3590cb1eac2a86a3e5cc606966
treee315f30c6cb4b40b670e9cbd15065851d5f44a33
parentb723ee73fc7d74fd5908eb09a8f6b98e73597c2b
parent06444bf050a267da7001c2801480c5fae3e1559e
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
app/assets/javascripts/components/components/status.jsx
app/assets/stylesheets/components.scss
config/settings.yml