5 commits

Author	SHA1	Message	Date
Tom	32b64f2eb7	Merge branch 'develop'	2016-05-08 18:14:51 +00:00
Tomislav R	949d2a3e58	fix contact ungleich	2016-05-08 19:58:37 +02:00
Tom	44d0046ccc	media	2016-05-08 00:21:30 +00:00
Tomislav R	e13947df8d	added media	2016-03-25 19:39:50 +01:00
rscnt	28120c6c22	settings: Added TEMPLATE_DIRS tuple and MEDIA_* ... Signed-off-by: rscnt <rascnt@gmail.com>	2015-05-20 22:57:00 -06:00