summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2011-08-31 21:21:16 +0200
committerBart Visscher <bartv@thisnet.nl>2011-08-31 21:21:38 +0200
commit9177a088b46d804608606a6f559ce6f9bf09d218 (patch)
tree670a0514b21bba99288f7aa59d41e18701eedf11
parent361861295ffbfed671b565e34392e93846dc3b49 (diff)
parent2815db2b07580a38696d174f7c8d457c86992d8a (diff)
downloadnextcloud-server-9177a088b46d804608606a6f559ce6f9bf09d218.tar.gz
nextcloud-server-9177a088b46d804608606a6f559ce6f9bf09d218.zip
Merge branch 'calendar' of git://gitorious.org/owncloud-dump/owncloud-dump into calendar
Merge to preserve history
0 files changed, 0 insertions, 0 deletions