diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-02 21:58:28 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-02 21:58:28 -0700 |
| commit | 1a5898bf80246fca87ecd7a56f9b7e4780e4089c (patch) | |
| tree | 7f80261ecac578fe8cedd1b32c591d37eda86dd8 /doc/credits.bb | |
| parent | 8b2b92fe3267af0b7f3fea33940a440c847c84f2 (diff) | |
| parent | 54301a9ff518224309664cd8c2f23cba0d30cb2d (diff) | |
| download | volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.gz volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.bz2 volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.zip | |
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
Diffstat (limited to 'doc/credits.bb')
| -rw-r--r-- | doc/credits.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/credits.bb b/doc/credits.bb index 4923bdadc..5459c7d7a 100644 --- a/doc/credits.bb +++ b/doc/credits.bb @@ -1,7 +1,6 @@ [b]Credits[/b] Mike Macgirvin -Thomas Willingham Fabio Comuni Simon L'nu marijus |