Mirror von https://github.com/friendica/friendica

Michael cafd400352 Merge remote branch 'upstream/master' ... Conflicts: view/theme/vier/style.css		2012-02-19 20:09:42 +01:00
doc	add :headdesk and fix doc/Pages.md to remove the absolute URL to /	2012-02-19 05:17:26 -05:00
images	add :headdesk and fix doc/Pages.md to remove the absolute URL to /	2012-02-19 05:17:26 -05:00
include	add :headdesk and fix doc/Pages.md to remove the absolute URL to /	2012-02-19 05:17:26 -05:00
js	nav: fix "See all notifications"	2012-01-23 09:23:37 +01:00
library	Documentation on Friendica changes to B8 and notice of source availability in accordance with LGPL	2012-02-15 23:02:05 -08:00
mod	Fixed log file issues on a freshly installed Friendica.	2012-02-18 14:19:35 -08:00
util	make 'x minutes ago' fully translateable with argument ordering. string update.	2012-02-12 17:15:09 -08:00
view	Merge remote branch 'upstream/master'	2012-02-19 20:09:42 +01:00
.gitignore	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
.htaccess	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
boot.php	revup	2012-02-17 10:13:06 -08:00
database.sql	poll structures	2012-02-13 18:02:43 -08:00
htconfig.php	by default allow pseudonyms	2012-01-25 00:30:36 -08:00
index.php	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
INSTALL.txt	Install note about PHP path.	2012-02-08 22:01:42 -08:00
LICENSE	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
testargs.php	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
update.php	poll structures	2012-02-13 18:02:43 -08:00
zot.txt	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00