diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:25:50 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:25:50 +0200 |
commit | 57d784f1e454af5500b608b7a3fd1452ecbb9e6a (patch) | |
tree | b9c4330970b1d2a62a2d41b90a6d03e2bc303b38 /app/models/setting.rb | |
parent | 16d50f60d1f802ee7760ca24883df2ed5a8f4ac0 (diff) | |
parent | ffb99325cafb5b00ee652c6b3ed2811a4d643fc8 (diff) |
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
Diffstat (limited to 'app/models/setting.rb')
0 files changed, 0 insertions, 0 deletions