Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Habeas Codice
2014-11-21 15:39:14 -08:00
9 changed files with 277 additions and 20 deletions

View File

@@ -85,3 +85,10 @@ Some/many of these widgets have restrictions which may restrict the type of page
* style - CSS style string
<br />&nbsp;<br />
* photo_rand - display a random photo from one of your photo albums. Photo permissions are honoured
* args:
* album - album name (very strongly recommended if you have lots of photos)
* scale - typically 0 (original size), 1 (640px), or 2 (320px)
* style - CSS style string
<br />&nbsp;<br />