Joachim Lusiardi cfb9dfabc0 Merge branch 'issue_5_more_consumable_material' into development ...

Conflicts:
	app/__init__.py

2016-07-17 09:22:38 +02:00

..

config

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

static

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

templates

Merge branch 'issue_5_more_consumable_material' into development

2016-07-17 09:22:38 +02:00

__init__.py

Merge branch 'issue_5_more_consumable_material' into development

2016-07-17 09:22:38 +02:00

entities.py

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

filters.py

Fixed project structure for pycharm

2016-07-03 19:29:30 +02:00

forms.py

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00

tools.py

Merge branch 'issue_5_more_consumable_material' into pycharm

2016-07-16 19:29:25 +02:00