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
|
8a71191d6d
|
make right_aside translatable and provide german translation...
and some css-fixes
|
2012-04-03 20:59:00 +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
|
893ece9066
|
bug fix in diabook-aerith and -red
|
2012-03-31 11:50:33 +02:00 |
|
|
tommy tomson
|
6d3d882f9b
|
css-fixes in diabook-derivates
|
2012-03-30 16:33:34 +02:00 |
|
|
tommy tomson
|
5ced7f2bc5
|
add themes diabook-red & diabook-aerith
|
2012-03-30 13:48:34 +02:00 |
|