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

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/views/layouts/application.html.erb
This commit is contained in:
Reinier Balt 2014-06-26 10:56:22 +02:00
commit 29acdc5a9d
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/environments/development.rb
View file

@ -26,6 +26,6 @@ Rails.application.configure do
# config.action_controller.session_store :cookie_store, :key => 'TracksCucumber'
# config.action_controller.session = { :key => 'TracksDev' }
NOTIFY_BAR="<div id=\"develop-notify-bar\">&nbsp;</div>"
config.rack_dev_mark.enable = true
end