diff options
author | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
commit | f840082aaead8356a5787109f0c67179ecdf7993 (patch) | |
tree | 05fcb73fae9412706a04a44a3188a187375d3ca4 /doc/about | |
parent | 47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 (diff) | |
parent | 3ccefa20e8b10d0a507c6b002237664e721ca389 (diff) | |
download | volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.gz volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.bz2 volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'doc/about')
-rw-r--r-- | doc/about/project.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/about/project.bb b/doc/about/project.bb index 7a584687d..f9bc920f8 100644 --- a/doc/about/project.bb +++ b/doc/about/project.bb @@ -182,4 +182,5 @@ even if we have had our occasional disagreements. [li]Simó Albert i Beltran[/li] [li]Manuel Reva[/li] [li]Manuel Jiménez Friaza[/li] -[/list]
\ No newline at end of file +[li]Gustav Wall aka "neue medienordnung plus"[/li] +[/list] |