4 Commits

Author	SHA1	Message	Date
Bernhard Stampfer	24e5b5f9e4	Merge branch 'master' of https://github.com/bernis/baroness ... Conflicts: app/database.pyc app/product.pyc app/views.pyc test/database.db	2016-02-15 20:30:32 +01:00
Bernhard Stampfer	6a5096512e	ignore	2016-02-15 20:28:00 +01:00
Ulrich Knechtelsdorfer	79bcf2e8ca	- add: add beverages	2016-02-13 22:05:49 +01:00
Ulrich Knechtelsdorfer	c84212e151	inital commit	2016-02-13 16:18:48 +01:00