b6c862b32f
Conflicts: apps/gallery/lib/tiles.php |
||
---|---|---|
.. | ||
admin_dependencies_chk | ||
admin_migrate | ||
bookmarks | ||
calendar | ||
contacts | ||
external | ||
files | ||
files_archive | ||
files_encryption | ||
files_external | ||
files_imageviewer | ||
files_odfviewer | ||
files_pdfviewer | ||
files_sharing | ||
files_texteditor | ||
files_versions | ||
gallery | ||
media | ||
remoteStorage | ||
tasks | ||
user_ldap | ||
user_migrate | ||
user_openid | ||
user_webfinger | ||
.gitkeep |