Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-29 12:16:11 +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

1
Gemfile
View file

@ -52,7 +52,6 @@ gem 'turbolinks'
group :development do
gem "yard"
gem "tolk", git: 'https://github.com/tolk/tolk'
gem 'protected_attributes' # needed for tolk. remove when tolk updates
gem "bullet"
gem "rack-mini-profiler"
end