Commit graph

7 commits

Author SHA1 Message Date
Vasudev Kamath ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
Zvi ben Yaakov (a.k.a rdc) 2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
Vasudev Kamath 8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
tommy tomson b32a731517 diabook-themes: bug-fixes 2012-04-16 17:12:08 +02:00
tommy tomson f980b79edc new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
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 bf4dd8ad17 add right_aside to theme diabook 2012-03-23 02:36:34 +01:00