Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

9794e7e4

Commit 9794e7e4 authored 13 years ago by Thomas Tanghus

Downloads
- Plain Diff

Fix merge conflict.

parents be948a9b c5c843bf

Branches

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

apps/calendar/ajax/updatecalendar.php 9 additions, 1 deletion

apps/calendar/ajax/updatecalendar.php
apps/calendar/appinfo/info.xml 1 addition, 1 deletion

apps/calendar/appinfo/info.xml
apps/calendar/appinfo/update.php 17 additions, 0 deletions

apps/calendar/appinfo/update.php
apps/calendar/js/calendar.js 1 addition, 1 deletion

apps/calendar/js/calendar.js
apps/calendar/lib/calendar.php 12 additions, 12 deletions

apps/calendar/lib/calendar.php
apps/contacts/ajax/saveproperty.php 1 addition, 1 deletion

apps/contacts/ajax/saveproperty.php
apps/contacts/js/contacts.js 1 addition, 1 deletion

apps/contacts/js/contacts.js
apps/contacts/lib/vcard.php 129 additions, 86 deletions

apps/contacts/lib/vcard.php
apps/media/css/music.css 2 additions, 2 deletions

apps/media/css/music.css
lib/helper.php 4 additions, 10 deletions

lib/helper.php
lib/util.php 4 additions, 3 deletions

lib/util.php

with 181 additions and 118 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment