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

..

base.html

ignore

2016-02-15 20:28:00 +01:00

billing.html

inital commit

2016-02-13 16:18:48 +01:00

consume.html

inital commit

2016-02-13 16:18:48 +01:00

index.html

ignore

2016-02-15 20:28:00 +01:00

login.html

inital commit

2016-02-13 16:18:48 +01:00

manage_beverages_add.html

- add: add beverages

2016-02-13 22:05:49 +01:00

manage_beverages_edit.html

- add: add beverages

2016-02-13 22:05:49 +01:00

manage_beverages.html

- add: add beverages

2016-02-13 22:05:49 +01:00

manage_users_add.html

inital commit

2016-02-13 16:18:48 +01:00

manage_users_edit.html

inital commit

2016-02-13 16:18:48 +01:00

manage_users.html

inital commit

2016-02-13 16:18:48 +01:00

not_baron.html

inital commit

2016-02-13 16:18:48 +01:00

not_logged_in.html

inital commit

2016-02-13 16:18:48 +01:00