wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. ... Updated migration date to today. Conflicts: db/schema.rb		2013-07-18 18:48:49 +02:00
..
images	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
javascripts	Undo senseless indentation correction 2	2013-07-16 22:04:44 +02:00
stylesheets	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00