GitBucket
|
resolved cherry-pick conflicts
|
|---|
briley
authored
on 18 May 2017
Brian Riley
committed
on 9 Jun 2017
|
| app/views/shared/_accessible_input.html.erb 0 → 100644 |
|---|
| app/views/shared/_accessible_input_email.html.erb 100644 → 0 |
|---|
| app/views/shared/_login_form.html.erb |
|---|
| config/application.rb |
|---|
| lib/assets/javascripts/application.js |
|---|
| lib/assets/javascripts/registrations/sign_in_sign_up.js |
|---|
| lib/assets/javascripts/roadmap-form.js 0 → 100644 |
|---|
| lib/assets/javascripts/roadmap-utils.js 0 → 100644 |
|---|
| lib/assets/javascripts/roadmap.js 100644 → 0 |
|---|
| lib/assets/javascripts/select2.min.js |
|---|
| lib/assets/stylesheets/application.css |
|---|
| lib/assets/stylesheets/roadmap-form.scss |
|---|
| lib/assets/stylesheets/roadmap-hacks.scss 0 → 100644 |
|---|
| lib/assets/stylesheets/roadmap-tabs.scss 0 → 100644 |
|---|
| lib/assets/stylesheets/roadmap.scss 0 → 100644 |
|---|
| lib/assets/stylesheets/select2.css |
|---|