Merge commit 'refs/merge-requests/18' of git://gitorious.org/owncloud/owncloud
merge Conflicts: index.php
No related branches found
No related tags found
Showing
- css/default.php 143 additions, 16 deletionscss/default.php
- files/get_file.php 1 addition, 1 deletionfiles/get_file.php
- files/open_file.php 63 additions, 0 deletionsfiles/open_file.php
- inc/lib_files.php 1 addition, 1 deletioninc/lib_files.php
- inc/lib_log.php 1 addition, 1 deletioninc/lib_log.php
- inc/templates/footer.php 10 additions, 0 deletionsinc/templates/footer.php
- inc/templates/header.php 5 additions, 0 deletionsinc/templates/header.php
- index.php 0 additions, 2 deletionsindex.php
- js/ajax.js 1 addition, 6 deletionsjs/ajax.js
- js/filebrowser.js 376 additions, 0 deletionsjs/filebrowser.js
- js/lib_ajax.js 62 additions, 13 deletionsjs/lib_ajax.js
- js/lib_event.js 49 additions, 0 deletionsjs/lib_event.js
- js/lib_files.js 62 additions, 318 deletionsjs/lib_files.js
- js/lib_notification.js 48 additions, 0 deletionsjs/lib_notification.js
- js/lib_timer.js 52 additions, 0 deletionsjs/lib_timer.js
Loading
Please register or sign in to comment