diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-27 18:54:26 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-27 18:54:26 +0200 |
commit | c13cfeac0952b112140d48a076d685730ff39b06 (patch) | |
tree | 304e82845e241ed35840e5e578dd496efb3f74a4 /spec/controllers/settings/deletes_controller_spec.rb | |
parent | 5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (diff) | |
parent | eef8d9a5f7d07bf785c6a7184e01374e211c6d7f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/controllers/settings/deletes_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions