diff options
author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
tree | e6022023d42dde628bb44880659104a87f985039 /app/serializers/rest/preferences_serializer.rb | |
parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) |
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/preferences_serializer.rb')
0 files changed, 0 insertions, 0 deletions