about summary refs log tree commit diff
path: root/spec/controllers/settings/preferences_controller_spec.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-05-19 21:52:27 +0200
committerGitHub <noreply@github.com>2019-05-19 21:52:27 +0200
commit46811f92e4b1705da5bb52e0e9e4e9e59ea1a15e (patch)
tree759b982e0eb44a98c86ce43ddc23aba4f097c5af /spec/controllers/settings/preferences_controller_spec.rb
parent4beb8d77889e4e152a483e4d17724fa83e7c0dd3 (diff)
parentf509815379ddfdca1af75d092d6d37ddfdddbcd4 (diff)
Merge pull request #1054 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/settings/preferences_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions