diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-11 12:35:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-11 12:35:25 +0200 |
| commit | fe00f7a7e4469d18b43be2159fa9d953d2050f46 (patch) | |
| tree | f2af743c222ad8d9dc81299195d01a3fe6b54e02 /app/controllers/settings/preferences_controller.rb | |
| parent | d4d4e84324701243ce05930f45b2dc876e38c7d0 (diff) | |
| parent | 14d855c42985503b525f1a77d00fada3bd15b96f (diff) | |
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
0 files changed, 0 insertions, 0 deletions