diff options
| author | elijah <elijah@riseup.net> | 2015-03-17 15:06:54 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-03-17 15:06:54 -0700 |
| commit | 74a8f39a0d91f7f992c41cced01f80f24001e173 (patch) | |
| tree | 2c459d89ed9d1e284098dc43715db813eab97f27 /.ruby-version | |
| parent | 2d42b4a39eaa346b94fa4aa2bb90bebb5621112e (diff) | |
| parent | 25b34acce7612f58c5d40819de79734b08cdfb8f (diff) | |
Merge branch 'develop' into version/0.6.1version/0.6.1
Conflicts:
Gemfile.lock
Diffstat (limited to '.ruby-version')
| -rw-r--r-- | .ruby-version | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..f3a9c9a --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +1.9.3-p194 |