aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorZakaria BOUZIANE2014-09-15 09:27:13 +0200
committerZakaria BOUZIANE2014-09-15 09:27:13 +0200
commit917e13fd1398dc246f2bda95e53ba3bab9794f44 (patch)
treebecc65439c5fef66166df0be01727fc6bb3267d1 /app/assets/javascripts
parent686dd5c553c1df0260285fc0648fb152acfb15c5 (diff)
parent7d44c95dbb514b6dd14151811a3ce7116d679722 (diff)
downloadchouette-core-917e13fd1398dc246f2bda95e53ba3bab9794f44.tar.bz2
Merge branch 'sismo' of https://github.com/afimb/chouette2 into sismo
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/stop_area_imports.js.coffee0
1 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/javascripts/stop_area_imports.js.coffee b/app/assets/javascripts/stop_area_imports.js.coffee
deleted file mode 100644
index e69de29bb..000000000
--- a/app/assets/javascripts/stop_area_imports.js.coffee
+++ /dev/null