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
|
23dc376364
|
diabook-themes: add link to global dir in "find friends" at right_aside
|
2012-04-02 01:29:20 +02:00 |
|
tommy tomson
|
8451b22d42
|
small fix in css
|
2012-03-24 08:56:26 +01:00 |
|
tommy tomson
|
ba027f174d
|
add right_aside to diabook-blue
|
2012-03-24 08:13:48 +01:00 |
|