-
- Downloads
fix merge conflicts
Showing
- 3rdparty/granite/git/blob.php 0 additions, 162 deletions3rdparty/granite/git/blob.php
- 3rdparty/granite/git/commit.php 0 additions, 232 deletions3rdparty/granite/git/commit.php
- 3rdparty/granite/git/object/index.php 0 additions, 210 deletions3rdparty/granite/git/object/index.php
- 3rdparty/granite/git/object/loose.php 0 additions, 81 deletions3rdparty/granite/git/object/loose.php
- 3rdparty/granite/git/object/packed.php 0 additions, 304 deletions3rdparty/granite/git/object/packed.php
- 3rdparty/granite/git/object/raw.php 0 additions, 153 deletions3rdparty/granite/git/object/raw.php
- 3rdparty/granite/git/repository.php 0 additions, 293 deletions3rdparty/granite/git/repository.php
- 3rdparty/granite/git/tag.php 0 additions, 38 deletions3rdparty/granite/git/tag.php
- 3rdparty/granite/git/tree.php 0 additions, 198 deletions3rdparty/granite/git/tree.php
- 3rdparty/granite/git/tree/node.php 0 additions, 126 deletions3rdparty/granite/git/tree/node.php
- apps/contacts/ajax/importaddressbook.php 24 additions, 0 deletionsapps/contacts/ajax/importaddressbook.php
- apps/contacts/ajax/uploadimport.php 50 additions, 0 deletionsapps/contacts/ajax/uploadimport.php
- apps/contacts/css/contacts.css 4 additions, 3 deletionsapps/contacts/css/contacts.css
- apps/contacts/import.php 18 additions, 3 deletionsapps/contacts/import.php
- apps/contacts/js/contacts.js 101 additions, 13 deletionsapps/contacts/js/contacts.js
- apps/contacts/lib/app.php 1 addition, 0 deletionsapps/contacts/lib/app.php
- apps/contacts/lib/vcard.php 37 additions, 4 deletionsapps/contacts/lib/vcard.php
- apps/contacts/templates/part.chooseaddressbook.php 2 additions, 1 deletionapps/contacts/templates/part.chooseaddressbook.php
- apps/contacts/templates/part.chooseaddressbook.rowfields.php 1 addition, 1 deletionapps/contacts/templates/part.chooseaddressbook.rowfields.php
- apps/contacts/templates/part.contact.php 1 addition, 1 deletionapps/contacts/templates/part.contact.php
Loading
Please register or sign in to comment