summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBrice Maron <brice@bmaron.net>2011-11-04 00:31:35 +0100
committerBrice Maron <brice@bmaron.net>2011-11-04 00:31:35 +0100
commitce2b39b398b1bf2143e1b16523de5325a766d24d (patch)
tree00aef6e4b63f9885fa672ef1c30a70dc27e1070f /lib
parent8eda6f8febcd8e7320d758e512d2d887d86debb0 (diff)
parenteaad3ab45fa8a1d33a24afd7147b674aa79434ee (diff)
downloadnextcloud-server-ce2b39b398b1bf2143e1b16523de5325a766d24d.tar.gz
nextcloud-server-ce2b39b398b1bf2143e1b16523de5325a766d24d.zip
Merge commit 'refs/merge-requests/69' of git://gitorious.org/owncloud/owncloud into merge-requests/69
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions