Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3' ... Conflicts: Gemfile Gemfile.lock		2013-06-10 01:53:31 +02:00
..
images	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
javascripts	Remove test variable	2013-06-06 17:09:22 +02:00
stylesheets	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00