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

4cbae823

Commit 4cbae823 authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'master' into calendar

parents deaeab3d 6163351e

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

apps/bookmarks/bookmarksHelper.php 48 additions, 3 deletions

apps/bookmarks/bookmarksHelper.php
apps/calendar/js/calendar.js 1 addition, 0 deletions

apps/calendar/js/calendar.js
apps/contacts/css/styles.css 1 addition, 0 deletions

apps/contacts/css/styles.css
apps/contacts/js/interface.js 0 additions, 7 deletions

apps/contacts/js/interface.js
apps/contacts/templates/index.php 1 addition, 1 deletion

apps/contacts/templates/index.php
apps/contacts/templates/part.details.php 1 addition, 1 deletion

apps/contacts/templates/part.details.php
apps/remoteStorage/compat.php 1 addition, 1 deletion

apps/remoteStorage/compat.php
apps/user_webfinger/activate.php 0 additions, 11 deletions

apps/user_webfinger/activate.php
apps/user_webfinger/appinfo/install.php 6 additions, 0 deletions

apps/user_webfinger/appinfo/install.php
index.php 9 additions, 1 deletion

index.php
lib/util.php 2 additions, 2 deletions

lib/util.php

with 70 additions and 27 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