]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #14530 from owncloud/revert-14403
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 27 Feb 2015 08:39:29 +0000 (00:39 -0800)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 27 Feb 2015 08:39:29 +0000 (00:39 -0800)
Revert "Updating license headers"

13 files changed:
1  2 
apps/files_encryption/appinfo/app.php
apps/files_sharing/lib/controllers/sharecontroller.php
lib/private/backgroundjob/joblist.php
lib/private/backgroundjob/queuedjob.php
lib/private/cache/fileglobalgc.php
lib/private/connector/sabre/objecttree.php
lib/private/files/view.php
lib/private/helper.php
lib/private/server.php
lib/private/util.php
lib/public/iservercontainer.php
settings/admin.php
version.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc version.php
Simple merge