Merge remote-tracking branch 'upstream/CDL-MVP' into xsrust/138
dev
commit 2abb2eb10f6c18c32bab83878701adc36e75a027
2 parents 9d72b08 + c208d41
@xsrust xsrust authored on 11 Jul 2017
Showing 7 changed files
View
app/controllers/templates_controller.rb
View
app/policies/template_policy.rb
View
app/views/contact_us/contacts/new.html.erb
View
app/views/templates/admin_index.html.erb
View
config/routes.rb
View
lib/assets/javascripts/dmproadmap/forms.js
View
lib/assets/javascripts/views/contacts/new_contact.js