diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-29 12:50:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 12:50:44 +0100 |
| commit | 907ebcfd43c7c051de831944a29620580fa8faa5 (patch) | |
| tree | 6c00f4972e86f44ba1899385eb107838d146e5c1 /app/controllers/api/v1/preferences_controller.rb | |
| parent | e1d29f7d9f85a25af7a1595d2c9afc127ab36ca7 (diff) | |
| parent | 427ef4948a4fdd1c34e7c7baa6dd5c967e32d932 (diff) | |
Merge pull request #1291 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/preferences_controller.rb')
0 files changed, 0 insertions, 0 deletions