Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
tommy tomson
|
feda3cfc96
|
fixed star-bug
|
2012-03-09 02:59:13 +01:00 |
|
tommy tomson
|
b9dda93f0c
|
add theme diabook-blue, fix css
|
2012-03-08 23:22:26 +01:00 |
|