upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-31 14:47:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
12792 commits 841 branches 1193 tags 6.6 GiB
Commit graph

4 commits

Author SHA1 Message Date
Georg Ehrke
d84d8f7108 fix merge conflicts 2013-07-30 12:35:39 +02:00
Georg Ehrke
ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
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