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 |
|
tommy tomson
|
0f3255467e
|
fixed login-fields, fixed. notofication.png, changed locations
|
2012-03-10 13:22:41 +01:00 |
|
|
Michael Vogel
|
cb1ecf2c5a
|
diabook: Moving the location between the icons
|
2012-03-10 00:15:27 +01:00 |
|
|
tommy tomson
|
feda3cfc96
|
fixed star-bug
|
2012-03-09 02:59:13 +01:00 |
|
|
tommy tomson
|
1653e5a615
|
fixes in diabook
|
2012-03-05 02:45:24 +01:00 |
|
|
tommy tomson
|
e0e0224fa6
|
some fixes in diabook
|
2012-03-04 05:48:06 +01:00 |
|