Tomislav R ec12689904 Merge remote-tracking branch 'upstream/develop' into develop		2016-04-09 09:57:56 +02:00
..
__init__.py	update django settings for local and production	2016-03-22 22:09:22 +01:00
__init__old.py	update django settings for local and production	2016-03-22 22:09:22 +01:00
base.py	home added and assigned right template	2016-04-09 08:51:20 +02:00
local.py	update django settings for local and production	2016-03-22 22:09:22 +01:00
prod.py	settings difference push	2016-03-16 15:23:15 +01:00