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

0 lines

Text

Raw Blame History