diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
| commit | 8b4abaa90d8dff64525d92c3ba1c750356608240 (patch) | |
| tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /public/emoji/1f926-1f3fd.svg | |
| parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
| parent | f06fa099625e928e5858ea81a20be1eddf6c6fbb (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
Diffstat (limited to 'public/emoji/1f926-1f3fd.svg')
0 files changed, 0 insertions, 0 deletions