aboutsummaryrefslogtreecommitdiffstats
path: root/apps/atnotes/ajax
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into share_apiMichael Gapczynski2012-07-255-0/+294
Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php