aboutsummaryrefslogtreecommitdiffstats
path: root/doc/Pages.md
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
commit355c42cb309eb1313097411067ca999b699aa620 (patch)
treed00d1af9dceecdf114cadff924c5ba4a864fbf43 /doc/Pages.md
parentcbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff)
parent9b6e91086b29554fd04362f6c87ea148718e8b1c (diff)
downloadvolse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts: include/config.php update.php
Diffstat (limited to 'doc/Pages.md')
-rw-r--r--[-rwxr-xr-x]doc/Pages.md0
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/Pages.md b/doc/Pages.md
index d0e6776a4..d0e6776a4 100755..100644
--- a/doc/Pages.md
+++ b/doc/Pages.md