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

4d1c414f

Commit 4d1c414f authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'calendar'

parents 06388e13 868cf462

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/calendar/ajax/importdialog.php 5 additions, 8 deletions

apps/calendar/ajax/importdialog.php
apps/calendar/import.php 104 additions, 28 deletions

apps/calendar/import.php
apps/calendar/import_tmp/Info 2 additions, 0 deletions

apps/calendar/import_tmp/Info
apps/calendar/js/loader.js 67 additions, 5 deletions

apps/calendar/js/loader.js
apps/calendar/templates/part.import.php 22 additions, 64 deletions

apps/calendar/templates/part.import.php

with 200 additions and 105 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