Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-26 18:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
tracks/config/locales
History
Reinier Balt 899df1ef8f Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/controllers/todos_controller.rb
	app/services/rich_message_extractor.rb
	app/services/todo_from_rich_message.rb
	app/views/todos/all_done.html.erb
	config/initializers/rack-mini-profiler.rb
	test/models/rich_message_extractor_test.rb
	test/models/todo_from_rich_message_test.rb
2014-03-06 10:31:39 +01:00
..
cs.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
de.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
en.bootstrap.yml install bootstrap 2013-06-21 08:53:35 +02:00
en.yml Merge branch 'master' into new-gui 2014-01-07 21:01:55 +01:00
es.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
fr.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
he.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00
nl.yml update Tolk to github master for rails 4 support. It currently needs protected_attributes 2014-02-09 14:39:36 +01:00