diff options
| author | Michael Meer <michael@meer.name> | 2014-01-30 10:21:21 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-30 10:21:21 +0100 |
| commit | e5d1e20ff50f49909e7df6fe7efe0d7488e58eaa (patch) | |
| tree | a3e0b7d7e1f9a4a8a2af39d5c8fad8d62f0411a3 /doc/bbcode.html | |
| parent | ef97a454bbccbd9f7e0e63180c365ed3227fe42c (diff) | |
| parent | 6c6a9b963a925d33b2cc436d877a4edc5f0d59b1 (diff) | |
| download | volse-hubzilla-e5d1e20ff50f49909e7df6fe7efe0d7488e58eaa.tar.gz volse-hubzilla-e5d1e20ff50f49909e7df6fe7efe0d7488e58eaa.tar.bz2 volse-hubzilla-e5d1e20ff50f49909e7df6fe7efe0d7488e58eaa.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with master repro
Diffstat (limited to 'doc/bbcode.html')
| -rw-r--r-- | doc/bbcode.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html index a24dd8b5d..cb8286ad7 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -9,6 +9,10 @@ <li>[color=red]red[/color] - <span style="color: red;">red</span><br /> <li>[url=https://redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br /> <li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br /> +<li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br /> +<div style="clear:both;"></div> +<li>[img float=right]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br /> +<div style="clear:both;"></div> <li>[code]code[/code] <code>code</code><br /> <li>[quote]quote[/quote] <blockquote>quote</blockquote><br /> <li>[quote=Author]Author? Me? No, no, no...[/quote] <br /><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote><br /> |