]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Apr 2017 23:25:50 +0000 (01:25 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Apr 2017 23:25:50 +0000 (01:25 +0200)
commit57d784f1e454af5500b608b7a3fd1452ecbb9e6a
treeb9c4330970b1d2a62a2d41b90a6d03e2bc303b38
parent16d50f60d1f802ee7760ca24883df2ed5a8f4ac0
parentffb99325cafb5b00ee652c6b3ed2811a4d643fc8
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
app/models/user.rb
app/views/home/initial_state.json.rabl
app/views/settings/preferences/show.html.haml