diff options
author | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
commit | 6679734135fb04f4a7beccb81663bf1e9574f062 (patch) | |
tree | 887488543d98b5dd297d917718bdd99844e83ba5 /doc/html/style_8php.js | |
parent | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (diff) | |
parent | c696860cc53bc25558d83de5eda65d9b583da382 (diff) | |
download | volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.gz volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.bz2 volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.zip |
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
Diffstat (limited to 'doc/html/style_8php.js')
-rw-r--r-- | doc/html/style_8php.js | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/doc/html/style_8php.js b/doc/html/style_8php.js deleted file mode 100644 index 35e00198f..000000000 --- a/doc/html/style_8php.js +++ /dev/null @@ -1,20 +0,0 @@ -var style_8php = -[ - [ "$colour", "style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab", null ], - [ "$displaystyle", "style_8php.html#aa658152b727ea1233f6df6ded6437dad", null ], - [ "$line_height", "style_8php.html#a4131d1765ee4deb28e83fc4527943ee0", null ], - [ "$linkcolour", "style_8php.html#a6628a80911a6b37b464ef110ac8f6e42", null ], - [ "$nav_bg_1", "style_8php.html#a232513bf4339fe34908c4c63cb93168b", null ], - [ "$nav_bg_2", "style_8php.html#a03a72942b7428fd9af1224770d20a8ba", null ], - [ "$nav_bg_3", "style_8php.html#acc190405dda0a23a80551dee11c74c0c", null ], - [ "$nav_bg_4", "style_8php.html#aef266cfcb27c6ddb3292584c945bab33", null ], - [ "$navcolour", "style_8php.html#a938168352fd3cdaa1c10c16a34f5938a", null ], - [ "$redbasic_font_size", "style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda", null ], - [ "$resolution", "style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc", null ], - [ "$shadows", "style_8php.html#acb3046ad9c01b7d60cde20f58d77c548", null ], - [ "$shiny", "style_8php.html#a0b942d36d8862908864e2ffa4521be70", null ], - [ "$site_colour", "style_8php.html#a02d39b683a42fffbb27823d3860283bd", null ], - [ "$site_line_height", "style_8php.html#a8749837e08dfb3372662af9c33fa2a2e", null ], - [ "$site_redbasic_font_size", "style_8php.html#a45e6fafa363bc4586fa91dce1786be4f", null ], - [ "if", "style_8php.html#a0a473a25349f07563d6c56d14031f02a", null ] -];
\ No newline at end of file |