Mirror of the github repository
Go to file
Simon L'nu 8c2bda46f7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  revert 01a2791e3a to avoid random preg internal errors. fix contact_template

* master:
2012-02-27 13:34:19 -05:00
doc attribution issue - don't take author name from contact if available from item. 2012-02-24 20:03:13 -08:00
images friendica.svg - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
include revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
js one more attempt 2012-02-25 17:07:38 -08:00
library fixed syntax errors 2012-02-27 14:12:44 +01:00
mod revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
util theme info (like plugin info) 2012-02-25 00:30:14 -08:00
view revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +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
INSTALL.txt INSTALL.txt - Friendika -> Friendica 2012-02-20 19:38:42 -03: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
README README file shortened because this was for my branch only. 2012-02-23 07:55:56 +01:00
boot.php spam db 2012-02-26 18:53:48 -08:00
database.sql spam db 2012-02-26 18:53:48 -08:00
htconfig.php theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -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
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 spam db 2012-02-26 18:53:48 -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

README