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
|
6dfd55668f
|
diabook-themes: css-fixes
|
2012-04-02 20:30:27 +02:00 |
|
tommy tomson
|
0b41654935
|
bug-fixes in diabook-derivates
|
2012-03-31 11:09:57 +02:00 |
|
tommy tomson
|
5ced7f2bc5
|
add themes diabook-red & diabook-aerith
|
2012-03-30 13:48:34 +02:00 |
|