Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / classes / statusnet.ini

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 338e5c5aeaace0486b78f87b1047e049df583e8e..a5de206c7fcb3514a9e66bc217f0fb5d40f360f0 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -337,6 +337,7 @@ location_id = 1
 location_ns = 1
 repeat_of = 1
 object_type = 2
+scope = 1
 
 [notice__keys]
 id = N
@@ -461,6 +462,43 @@ tagger = K
 tagged = K
 tag = K
 
+[profile_list]
+id = 129
+tagger = 129
+tag = 130
+description = 34
+private = 17
+created = 142
+modified = 384
+uri = 130
+mainpage = 130
+tagged_count = 129
+subscriber_count = 129
+
+[profile_list__keys]
+id = U
+tagger = K
+tag = K
+
+[profile_tag_inbox]
+profile_tag_id = 129
+notice_id = 129
+created = 142
+
+[profile_tag_inbox__keys]
+profile_tag_id = K
+notice_id = K
+
+[profile_tag_subscription]
+profile_tag_id = 129
+profile_id = 129
+created = 142
+modified = 384 
+
+[profile_tag_subscription__keys]
+profile_tag_id = K
+profile_id = K
+
 [queue_item]
 id = 129
 frame = 194
@@ -590,10 +628,12 @@ smsreplies = 17
 smsemail = 2
 uri = 2
 autosubscribe = 17
+subscribe_policy = 17
 urlshorteningservice = 2
 inboxed = 17
 design_id = 1
 viewdesigns = 17
+private_stream = 17
 created = 142
 modified = 384
 
@@ -621,6 +661,7 @@ created = 142
 modified = 384
 uri = 2
 mainpage = 2
+join_policy = 1
 
 [user_group__keys]
 id = N