Michael Vogel d653e27e2d Merge commit 'upstream/master' ...

Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl

2012-03-11 20:22:28 +01:00

..

icons

fixed login-fields, fixed. notofication.png, changed locations

2012-03-10 13:22:41 +01:00

contact_template.tpl

adjust

2012-03-02 16:01:20 +01:00

experimental

adjust

2012-03-02 16:01:20 +01:00

jot.tpl

fixes in diabook

2012-03-05 03:08:58 +01:00

nav.tpl

Merge pull request #116 from tomtom84/master

2012-03-09 09:17:01 -08:00

profile_vcard.tpl

add links to /profiles, add some icons to diabook/icons, fixes in css

2012-03-08 14:49:07 +01:00

style.css

Merge commit 'upstream/master'

2012-03-11 20:22:28 +01:00

theme.php

fixed login-fields, fixed. notofication.png, changed locations

2012-03-10 13:22:41 +01:00

wall_item.tpl

Merge commit 'upstream/master'

2012-03-11 20:22:28 +01:00

wallwall_item.tpl

Merge commit 'upstream/master'

2012-03-11 20:22:28 +01:00