diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /doc/addons.bb | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'doc/addons.bb')
| -rw-r--r-- | doc/addons.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/addons.bb b/doc/addons.bb index cad662308..1be88150d 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -42,7 +42,7 @@ [*] qrator - generate QR code images [*] rainbowtag - display your tag and category clouds in colours [*] randpost - post/reply bot based on and requires fortunate -[*] redred - Crosspost to another Redmatrix channel +[*] redred - Crosspost to another Redmatrix or Hubzilla channel [*] rtof - Crosspost to Friendica [*] smiley_pack - extend the built-in smilie (emoticon) support [*] smileybutton - provides a smiley selector on the post window @@ -51,7 +51,7 @@ [*] superblock - Highly recommended - completely block an offensive channel from your stream [*] tictac - 3D tic-tac-toe [*] torch - flashlight app -[*] tour - feature tour for new red#matrix members +[*] tour - feature tour for new members [*] twitter - crosspost to Twitter [*] upload_limits - discover what server setting (there are a few) may be causing large photo uploads to fail [*] visage - show visitors to your channel @@ -61,7 +61,7 @@ [h3]Addon Repositories[/h3] -[url=https://github.com/redmatrix/redmatrix-addons]https://github.com/redmatrix/redmatrix-addons[/url] Main project addon repository +[url=https://github.com/redmatrix/hubzilla-addons]https://github.com/redmatrix/hubzilla-addons[/url] Main project addon repository [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip) |