diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-21 18:00:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 18:00:08 -0600 |
| commit | a90d0419d97db50cca034b9d30969f3d161a69b1 (patch) | |
| tree | 86c6a4182cda85171caf2f5c1553c054ed7b7e1f /spec/controllers/admin/instances_controller_spec.rb | |
| parent | 81b78fac542be867eedc7a0310e29de30b382770 (diff) | |
| parent | 48d79007f616ba03f663d29536927f6ab14e4b53 (diff) | |
Merge pull request #343 from glitch-soc/merge-upstream-20180121
Merge upstream
Diffstat (limited to 'spec/controllers/admin/instances_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions