Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-29 13:28:49 +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 2014-01-07 21:01:55 +01:00
parent fa537fbeb0
commit eb1502d4e0
28 changed files with 385 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/controllers/preferences_controller_test.rb
View file

@ -4,7 +4,6 @@ class PreferencesControllerTest < ActionController::TestCase
def setup
super
assert_equal "test", Rails.env
assert_equal "change-me", Tracks::Config.salt
end