Commit graph

7 commits

Author SHA1 Message Date
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
e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tommy tomson
e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
tommy tomson
b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
tommy tomson
60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00