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

..

static

inital commit

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

templates

Merge branch 'master' of https://github.com/bernis/baroness

2016-02-15 20:30:32 +01:00

__init__.py

inital commit

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

__init__.pyc

ignore

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

check_rights.py

inital commit

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

check_rights.pyc

ignore

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

consumption.py

inital commit

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

consumption.pyc

ignore

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

database.py

- add: add beverages

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

database.pyc

ignore

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

gui.py

inital commit

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

gui.pyc

ignore

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

plot.py

First plot: beer over time - beer still hardcoded at index 1

2016-02-15 20:14:37 +01:00

product.py

- add: add beverages

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

product.pyc

ignore

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

user.py

inital commit

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

user.pyc

ignore

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

users.pyc

inital commit

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

views.py

Merge branch 'master' of https://github.com/bernis/baroness

2016-02-15 20:30:32 +01:00

views.pyc

ignore

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