Evan Prodromou
|
5d09b6b3f0
|
Merge branch '0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
|
2009-08-27 11:16:45 -07:00 |
Evan Prodromou
|
020ee72943
|
update doc-src with StatusNet, status.net
|
2009-08-25 18:23:26 -04:00 |
|
Evan Prodromou
|
fbe99bbd18
|
remove openid menu item from help menu
|
2009-08-21 17:01:18 -04:00 |
|
Evan Prodromou
|
5666f0e0bd
|
add bookmarklet to main help
|
2009-04-07 22:50:15 -04:00 |
|
Evan Prodromou
|
1a7337f2fd
|
Moved /doc/ to /doc-src/
Moved the doc/ dir to /doc-src/ so that the actual
markdown files aren't substituted for the docs.
|
2009-02-10 22:33:57 -05:00 |