diff options
| author | friendica <info@friendica.com> | 2014-12-10 16:26:36 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-10 16:26:36 -0800 |
| commit | 7f1a42340a3f0967e23cf836b2c417a1b9b9b20b (patch) | |
| tree | 27627ee92feb7ac5c16fcb1214f0819d2f68c653 /doc/diaspora_compat.md | |
| parent | 58067c24fc5200993539af6d7f7254877662c3c9 (diff) | |
| parent | c91aa863d85e6d3b3a260fefe5e281d66730c4c9 (diff) | |
| download | volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.tar.gz volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.tar.bz2 volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'doc/diaspora_compat.md')
| -rw-r--r-- | doc/diaspora_compat.md | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/doc/diaspora_compat.md b/doc/diaspora_compat.md index 3be53c839..3829a9c64 100644 --- a/doc/diaspora_compat.md +++ b/doc/diaspora_compat.md @@ -54,12 +54,4 @@ Diaspora members will not appear in the directory. There are differences in oembed compatibility between the networks. Some embedded resources will turn into a link on one side or the other. - - - - - - - - -
\ No newline at end of file +#include doc/macros/main_footer.bb; |