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 |
|
|
|
6eafd24872
|
this file needs executable right again ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-03-01 20:22:12 +01:00 |
|
hauke
|
cd976b8dcc
|
Removed gender and marital status for better privacy
|
2015-12-24 08:42:48 +01:00 |
|
hauke
|
735ca9d6fa
|
populate the development server with default sync servers to get data
|
2015-11-08 18:01:23 +01:00 |
|
hauke
|
bab5446614
|
added cron jobs
|
2015-11-08 17:41:28 +01:00 |
|
hauke
|
50b60f6735
|
added a vagrant configuration for development
|
2015-11-08 16:54:15 +01:00 |
|
friendica
|
c153449475
|
string update
|
2012-05-17 20:54:03 -07:00 |
|
friendica
|
7ddae278aa
|
initial work for translation
|
2012-05-16 18:38:32 -07:00 |
|
