tracks/app
Reinier Balt 9c86396ef0 Merge branch 'master' into new-gui
Conflicts:
	app/views/projects/_project_settings.html.erb
	app/views/todos/_todo.html.erb
2013-09-13 16:52:06 +02:00
..
assets remove executable modes from these image files 2013-09-05 10:39:06 +02:00
controllers Merge branch 'master' into new-gui 2013-09-13 16:52:06 +02:00
helpers Merge branch 'master' into new-gui 2013-09-13 16:52:06 +02:00
mailers initial upgrade to rails 3.2.3 2012-04-30 13:56:33 +02:00
models Merge branch 'master' into new-gui 2013-09-13 16:52:06 +02:00
services Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03:00
views Merge branch 'master' into new-gui 2013-09-13 16:52:06 +02:00