diff options
| author | jessib <jessib@riseup.net> | 2013-12-17 12:02:07 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-12-17 12:02:07 -0800 |
| commit | 98a247acb4d1be484c2982d48ec038eed3de3d55 (patch) | |
| tree | f176092fa43145b9d8ce00a180fab70cf62da456 /app/assets/javascripts | |
| parent | 634db9875cc8f6f6b9a4a83dfc6b8d53728eb2b5 (diff) | |
| parent | 83cd3d95b78b6df9ac33a8ee169e570f4d3e2eeb (diff) | |
Merge branch 'develop' into feature/billing-no-authenticated-payments
Conflicts:
billing/config/locales/en.yml
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cd90934..03a40da 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,9 +16,8 @@ //= require bootstrap //= require rails.validations //= require rails.validations.simple_form - //= require leap +//= require platform //= require tickets //= require users - //= require_tree . |