diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
| commit | b483f2aab856e3324026588a9702043072fd7ad2 (patch) | |
| tree | 9a5696d43ae53160bee592e1b6874185cbd98ad4 /themes | |
| parent | cbaf858dea0f2094805edb6aa223bdd6877fff5b (diff) | |
| parent | 598815b21e94219eb66684c64802e165a35180ad (diff) | |
| download | nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.tar.gz nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.zip | |
Merge branch 'master' into routing
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/README b/themes/README index e348f86a120..4025bc8970e 100644 --- a/themes/README +++ b/themes/README @@ -2,6 +2,6 @@ This is the themes folder. Themes can be used to customize the look and feel of Themes can be placed in this folder with the name of the theme as foldername. The theme can be activated by putting "theme" => 'themename', into the config.php file. The folder structure of a theme is exactly the same as the main ownCloud structure. You can override js files and templates with own versions. css files are loaded additionaly to the default files so you can override css properties. -Themes should be developed here: https://gitorious.org/owncloud/themes +Themes should be developed here: https://github.com/owncloud/themes You can also find a super simple example there |