Merge branch '1.1.x'
This commit is contained in:
		
							
								
								
									
										2
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								README
									
									
									
									
									
								
							@@ -123,7 +123,7 @@ It includes the following changes:
 | 
				
			|||||||
- Bug fix for conversation counts in conversation streams.
 | 
					- Bug fix for conversation counts in conversation streams.
 | 
				
			||||||
- Rights for moderators to manage spam.
 | 
					- Rights for moderators to manage spam.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
A full changelog is available at http://status.net/wiki/StatusNet_1.1.0-alpha1.
 | 
					A full changelog is available at http://status.net/wiki/StatusNet_1.1.0.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Troubleshooting
 | 
					Troubleshooting
 | 
				
			||||||
===============
 | 
					===============
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user