diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 11:22:25 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 11:22:25 +0100 |
| commit | 94ad76a5b95c5021e3b8b291aeb3558548c9990a (patch) | |
| tree | dbe38121788776532d7af67ef7ebcabf11c622b8 /spec/controllers/admin/instances_controller_spec.rb | |
| parent | 7ec3f6022d5c991bb584c481a29c416e9f1c5438 (diff) | |
| parent | 6771e8c88c0a9c4e8a4cd8bd659a7eac2270eb75 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/controllers/admin/instances_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions