Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-25 19:48:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
This commit is contained in:
Reinier Balt 2013-07-28 13:35:34 +02:00
commit f32547136b
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -75,7 +75,10 @@ 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)