Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css

1 files changed, 5 insertions, 9 deletions

diff --git a/done b/done
index 908ffc8f3..35ceb4eb9 100644
--- a/done
+++ b/done
@@ -32,18 +32,15 @@ include/
 ? dba.php
 ? delivery.php
 + directory.php
-- email.php
 + enotify.php
 + event.php
 + expire.php
-  fcontact.php
 ? follow.php
-  gprobe.php
++ gprobe.php
 + group.php
-  html2bbcode.php
-  html2plain.php
+= html2bbcode.php
+= html2plain.php
 + identity.php
-  iquery.php
 ? items.php
 + js_strings.php
 + language.php
@@ -63,7 +60,6 @@ include/
 ?  queue_fn.php
 ?  queue.php
 - salmon.php
-= Scrape.php
 + security.php
 ? session.php
 ? socgraph.php
@@ -79,8 +75,8 @@ mod/
 + abook.php -> moved to connections.php
 ? acl.php
   admin.php
-  allfriends.php
-  api.php
++ allfriends.php
++ api.php
 + apps.php
 + attach.php
 - auth.php