aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-01-27 09:27:43 +0100
committerLuc Donnet2014-01-27 09:27:43 +0100
commit049db50774bcc3713c98fd6cc636e6dbbec9499e (patch)
tree286bc1f54abf32bfae95a3014f03e5c1849f628a
parenta5a76f4f07620ee710d20eb165abcde7d4ebaa2f (diff)
parent50eeb0e37559778019386acb456aa003924e483d (diff)
downloadchouette-core-049db50774bcc3713c98fd6cc636e6dbbec9499e.tar.bz2
Merge branch 'master' of github.com:afimb/chouette2
-rw-r--r--.ruby-version1
-rw-r--r--.rvmrc1
2 files changed, 1 insertions, 1 deletions
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 000000000..8e1735244
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+ruby-1.9.3-p448
diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index d00bbb5f0..000000000
--- a/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm ruby-1.9.3-p448