Ian Denhardt
							
						 
					 | 
					
						
						
							
						
						e36399974e
					 | 
					
						
						
							
							Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
						
						
						
						
						
						
						
						Conflicts:
	lib/action.php
	plugins/OStatus/actions/ostatusinit.php 
						
						
					 | 
					
						2010-12-20 15:19:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						ef1cb1cc94
					 | 
					
						
						
							
							explicitly license documentation under CC-BY 3.0
						
						
						
						
						
						
					 | 
					
						2010-09-03 15:26:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matt Lee
							
						 
					 | 
					
						
						
							
						
						f07cf26b00
					 | 
					
						
						
							
							updated
						
						
						
						
						
						
					 | 
					
						2010-08-09 18:35:29 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						bb70f77a5c
					 | 
					
						
						
							
							Ticket 2038: fix bad bug tracker link
						
						
						
						
						
						
					 | 
					
						2009-11-28 15:23:56 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						020ee72943
					 | 
					
						
						
							
							update doc-src with StatusNet, status.net
						
						
						
						
						
						
					 | 
					
						2009-08-25 18:23:26 -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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |