diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-05 10:23:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 10:23:32 +0200 |
| commit | 6b02591fa3b08598a348512ccac47a1fb881a6a5 (patch) | |
| tree | b34aa39324874a8db0e957af14b08a3ca6646a26 /public/emoji/1f1fa-1f1f2.png | |
| parent | aab818717e7700c35ebe5612c1eb7424fc53127f (diff) | |
| parent | 03adb5d7277bc1672ce3617d328280873e671b24 (diff) | |
Merge pull request #910 from krainboltgreene/master
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
Diffstat (limited to 'public/emoji/1f1fa-1f1f2.png')
0 files changed, 0 insertions, 0 deletions