Commit Graph

2 Commits

Author SHA1 Message Date
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview
Conflicts:
	3rdparty
	lib/template.php
2013-07-30 00:34:36 +02:00
Bart Visscher 2593395561 Move template functions to there own file 2013-07-21 21:37:25 +02:00