Reinier Balt d64f6e003e Merge branch 'master' into rails4 ... Conflicts: Gemfile.lock		2013-06-21 10:20:36 +02:00
..
assets	fix #1422. Changing default tags of a project is now remembered	2013-06-04 10:50:42 +02:00
controllers	Merge branch 'master' into rails4	2013-06-21 10:20:36 +02:00
helpers	fix cache invariant for grouped todos in context and project view	2013-06-19 17:47:51 +02:00
mailers	initial upgrade to rails 3.2.3	2012-04-30 13:56:33 +02:00
models	Merge branch 'master' into rails4	2013-06-17 09:25:02 +02:00
views	Merge branch 'master' into rails4	2013-06-21 10:20:36 +02:00