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

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2013-07-28 13:37:45 +02:00
commit dbe8060bec
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Gemfile.lock
View file

@ -75,10 +75,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
<<<<<<< HEAD
commonjs (0.2.6)
=======
>>>>>>> master
cucumber (1.3.5)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@ -108,6 +105,7 @@ GEM
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
less (2.3.2)
commonjs (~> 0.2.6)
less-rails (2.3.3)
@ -231,6 +229,7 @@ DEPENDENCIES
factory_girl_rails
htmlentities
jquery-rails
json
less-rails
mocha
mousetrap-rails