diff options
| author | anaqreon <tamanning@zoho.com> | 2014-12-30 16:06:35 -0600 |
|---|---|---|
| committer | anaqreon <tamanning@zoho.com> | 2014-12-30 16:06:35 -0600 |
| commit | b78a545a1056e6db9f4b6b4f262182b0a5c56e67 (patch) | |
| tree | 515c2f742a5a39e18b00debf1849ee9703fa4a42 /doc/history.md | |
| parent | d67c5a6ffd134602084a6dcb37b316bf768bf715 (diff) | |
| parent | 43671a0a323afa758df56c06822ce3c46da026df (diff) | |
| download | volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.tar.gz volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.tar.bz2 volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.zip | |
Merge pull request #1 from friendica/master
Pull from upstream
Diffstat (limited to 'doc/history.md')
| -rw-r--r-- | doc/history.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/history.md b/doc/history.md index b626d376e..12091d205 100644 --- a/doc/history.md +++ b/doc/history.md @@ -46,5 +46,4 @@ Over time a few federation components re-emerged. The ability to view RSS feeds That brings us up to the present. Where will RedMatrix go from here? I don't know. That's up to you. - - +#include doc/macros/main_footer.bb; |