Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-06 16:01:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rails4

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2013-06-21 10:20:36 +02:00
commit d64f6e003e
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -127,7 +127,7 @@ GEM
activesupport (= 4.0.0.rc2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.0.4)
rake (10.1.0)
ref (1.0.5)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)