merge master

This commit is contained in:
Neil Lalonde
2016-03-31 17:33:25 -04:00
parent 95f2ac6535
commit 01d0aeb5a9
6404 changed files with 88070 additions and 62390 deletions
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::PluginsController do