GitBucket
|
fixed merge conflicts
|
|---|
briley
authored
on 18 Jul 2017
|
| app/views/shared/_accessible_submit_button.html.erb |
|---|
| lib/assets/javascripts/dmproadmap/forms.js |
|---|
| lib/assets/javascripts/dmproadmap/utils.js |
|---|
| lib/assets/javascripts/views/contacts/new_contact.js |
|---|
| lib/assets/javascripts/views/devise/registrations/edit.js |
|---|
| lib/assets/javascripts/views/plans/index.js |
|---|
| lib/assets/javascripts/views/plans/share.js |
|---|
| lib/assets/javascripts/views/plans/show.js |
|---|
| lib/assets/javascripts/views/shared/login_form.js |
|---|
| lib/assets/javascripts/views/shared/register_form.js |
|---|