Commit graph

6 commits

Author SHA1 Message Date
Hypolite Petovan a8dc2e65f4 Merge branch 'master' into feature/redesign-prototype
# Conflicts:
#	.gitignore
#	.htconfig.php
#	.htconfig.php-dist
#	boot.php
#	include/dba.php
#	mod/health.php
#	util/htconfig.vagrant.php
2017-04-20 22:33:41 -04:00
Roland Häder c353b31569
Cleanups:
- don't commit files that are being ignored, better provide a "template" file
  that needs copying to the right file and ignore the file that will have local
  changes like config files will always have.
- fixed CHMOD, no need for executable flag here as the server won't execute
  these files, but only load (read) them
- fixed E_NOTICE in boot.php when entrance/index page (no parameter) is being
  called

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-01 20:00:32 +01:00
hauke cd976b8dcc Removed gender and marital status for better privacy 2015-12-24 08:42:48 +01:00
Beanow 5c477f9b7f Faster import, better admin panel. 2014-07-11 01:35:30 +02:00
Beanow 717303e475 Merged import tools with admin view. 2014-07-11 00:30:36 +02:00
friendica ea309f20ee initial 2012-05-15 22:31:36 -07:00