diff options
author | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
commit | 315d496290747aab8b3147dc24b822460071bb2d (patch) | |
tree | 4d3cd849580d7ba3b8c30667bbb6f0901dc7d738 /view/theme/diabook | |
parent | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (diff) | |
parent | 5c0446975516f2b52b6cf51618e0b75af56de71b (diff) | |
download | volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.gz volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.bz2 volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/diabook')
-rw-r--r-- | view/theme/diabook/style-network.css | 2 | ||||
-rw-r--r-- | view/theme/diabook/style-profile.css | 2 | ||||
-rw-r--r-- | view/theme/diabook/style-settings.css | 2 | ||||
-rw-r--r-- | view/theme/diabook/style.css | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 5a4bdfd81..af6e4027a 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2549,4 +2549,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -}
\ No newline at end of file +} diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 79a0866be..6b05903d3 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2546,4 +2546,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -}
\ No newline at end of file +} diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index fdb4f24c7..60e2f336b 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -2526,4 +2526,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -}
\ No newline at end of file +} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c06449d01..e99aa5644 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -2687,4 +2687,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -}
\ No newline at end of file +} |