Reinier Balt d3f46c59eb Merge branch 'master' into new-gui ... Conflicts: app/views/contexts/show.html.erb		2013-09-05 20:19:48 +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-05 20:19:48 +02:00
helpers	add forms for new todo and multiple todos to modal	2013-08-26 12:08:33 +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-05 12:24:47 +02:00
services	Pull out RichMessageExtractor	2013-07-18 18:34:09 -05:00
views	Merge branch 'master' into new-gui	2013-09-05 20:19:48 +02:00