Merge branch 'master' into notes

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 8d6c13503095b9d3282446ade0e19637116a9b4a..284ec77e618576c66f54984e5948c95c7ee1c8b7 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,6 +10,7 @@
 //= require leaflet.pan
 //= require leaflet.zoom
 //= require i18n/translations
+//= require oauth
 //= require osm
 //= require piwik
 //= require map