]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bf88bd1) | patch
resolving conflict when picking 8b81a0b
authorraghunayyar <me@iraghu.com>
Wed, 19 Feb 2014 15:53:29 +0000 (21:23 +0530)
committerArthur Schiwon <blizzz@owncloud.com>
Mon, 2 Jun 2014 10:53:52 +0000 (12:53 +0200)
commit9ba4a7621446433fcf5eed2569473984753141a0
tree875d7e4ffe5c90bbd82913c0b5614443ca73137btree | snapshot
parentbf88bd108e5acc9257428f7ff6d727f157b58450commit | diff
resolving conflict when picking 8b81a0b
settings/templates/users.php [deleted file] blob | history
settings/templates/users/main.php [new file with mode: 0644] blob
settings/templates/users/part.createuser.php [new file with mode: 0644] blob
settings/templates/users/part.grouplist.php [new file with mode: 0644] blob
settings/templates/users/part.setquota.php [new file with mode: 0644] blob
settings/templates/users/part.userlist.php [new file with mode: 0644] blob
settings/users.php diff | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server