diff options
| author | Kibigo! <marrus-sh@users.noreply.github.com> | 2017-04-02 21:07:07 -0700 |
|---|---|---|
| committer | Kibigo! <marrus-sh@users.noreply.github.com> | 2017-04-02 21:07:07 -0700 |
| commit | 565568dd9c5bc82c7de40fe021e8705b95aeb32d (patch) | |
| tree | 0278c53e8630fe7c262375bce023ed5948c3bc7a /app/controllers/settings/preferences_controller.rb | |
| parent | 6e41ef55ed629953427accab3b3166883953125c (diff) | |
| parent | 1a5ab538de2ea0c8e6f8faf357c17a90a41897e5 (diff) | |
Merging 'upstream' updates
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
0 files changed, 0 insertions, 0 deletions