wvengen eef4626107 Merge branch 'master' into updated-gems ... Conflicts: Gemfile.lock app/views/deliveries/_form.html.haml		2013-07-17 11:04:28 +02:00
..
application.js	Merge branch 'master' into updated-gems	2013-07-17 11:04:28 +02:00
bootstrap.js.coffee	Added twitter bootstrap layout. Adapt home page.	2012-10-06 17:14:57 +02:00
ordering.js	merge branch minimum_balance into master (closes #133)	2013-07-10 22:03:57 +02:00
stupidtable.js	Replace 'own' js table sorting by stupidtable plugin	2013-07-16 22:01:56 +02:00