Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-24 01:36:10 +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:
Dan Rice 2014-04-02 13:26:17 -04:00
commit fdd4c267b3
39 changed files with 2824 additions and 1022 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -133,8 +133,6 @@ GEM
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
polyglot (0.3.4)
protected_attributes (1.0.7)
activemodel (>= 4.0.1, < 5.0)
rack (1.5.2)
rack-mini-profiler (0.9.1)
rack (>= 1.1.3)
@ -245,7 +243,6 @@ DEPENDENCIES
mocha
mousetrap-rails
mysql2
protected_attributes
rack-mini-profiler
rails (~> 4.0.0)
rails_autolink