diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-05-04 10:12:05 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-05-04 10:12:05 +0200 |
commit | a92b9b7adb2be489106138b6269a5f7fe8eea5aa (patch) | |
tree | abab4112741f5d28720185fe0308552de23f5e48 /doc/about/hubzilla_project.bb | |
parent | 263cfe2538a3e1a4e866c80b44ada158475cc792 (diff) | |
parent | bc776a9534b57231b83f4c65fefdc3637db0e024 (diff) | |
download | volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.tar.gz volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.tar.bz2 volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'doc/about/hubzilla_project.bb')
-rw-r--r-- | doc/about/hubzilla_project.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/about/hubzilla_project.bb b/doc/about/hubzilla_project.bb index 7a584687d..f9bc920f8 100644 --- a/doc/about/hubzilla_project.bb +++ b/doc/about/hubzilla_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] |