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

323a98ad

Commit 323a98ad authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar

parents ea8461e8 c383543e

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

apps/calendar/ajax/editcalendar.php 1 addition, 10 deletions

apps/calendar/ajax/editcalendar.php
apps/calendar/ajax/newcalendar.php 2 additions, 0 deletions

apps/calendar/ajax/newcalendar.php
apps/calendar/export.php 2 additions, 2 deletions

apps/calendar/export.php
apps/calendar/js/calendar.js 3 additions, 2 deletions

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

apps/calendar/lib/calendar.php
apps/calendar/lib/connector_sabre.php 0 additions, 1 deletion

apps/calendar/lib/connector_sabre.php
apps/files_imageviewer/css/lightbox.css 10 additions, 1 deletion

apps/files_imageviewer/css/lightbox.css
apps/files_imageviewer/js/lightbox.js 12 additions, 5 deletions

apps/files_imageviewer/js/lightbox.js
core/css/styles.css 1 addition, 0 deletions

core/css/styles.css
core/img/loading-dark.gif 0 additions, 0 deletions

core/img/loading-dark.gif
core/templates/installation.php 1 addition, 1 deletion

core/templates/installation.php
index.php 9 additions, 1 deletion

index.php
settings/languageCodes.php 1 addition, 1 deletion

settings/languageCodes.php

with 54 additions and 24 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