Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-27 04:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
tracks/app
History
Reinier Balt 59291f305f Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/helpers/todos_helper.rb
	app/views/shared/_footer.html.erb
2014-06-26 10:46:20 +02:00
..
assets Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
controllers Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
helpers Merge branch 'master' into new-gui 2014-06-26 10:46:20 +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 2014-06-26 10:46:20 +02:00
services make todo_from_rich_message time zone aware. test was failing. 2014-01-26 15:05:27 +01:00
views Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00