commit 1db63b51761f51894673c515ac9f7f6cee8b2e4f
Merge: 419a2bf fa95b4d
Author: Artur Frysiak <[email protected]>
Date: Thu Dec 12 19:11:36 2013 +0100
Merge branch 'owncloud-6'
Conflicts:
owncloud.spec
owncloud.spec | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/1db63b51761f51894673c515ac9f7f6cee8b2e4f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
