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
|
d4ac1f2a9c
|
fixed star/unstar
|
2012-03-03 19:07:55 +01:00 |
|
tommy tomson
|
89f667ff76
|
fix star/unstar
|
2012-03-03 04:45:34 +01:00 |
|
tommy tomson
|
c26787ab94
|
adjust2
|
2012-03-02 17:18:11 +01:00 |
|