rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	649578ae33
						 | 
						
							
							
								
								
								Merge develop-new into event-attendance-new
							
							
							
							
							
							
							
							Conflicts:
	include/conversation.php 
							
						 | 
						
							2015-10-11 19:39:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	c775d6885b
						 | 
						
							
							
								
								
								port of reds geotag feature
							
							
							
							
							
						 | 
						
							2015-10-03 20:24:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	7cb4ea52fd
						 | 
						
							
							
								
								
								port of the event attendance feature of red matrix with example implementation for vier theme.
							
							
							
							
							
						 | 
						
							2015-09-30 16:58:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	f5c7006f30
						 | 
						
							
							
								
								
								rest of the consensus porting work and integration into friendica
							
							
							
							
							
							
							
							Credits to Mike Macgirvin for the code 
							
						 | 
						
							2015-09-30 14:38:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	56f0af2067
						 | 
						
							
							
								
								
								The "ignore" feature can be disabled and enabled, the value will now be retrieved.
							
							
							
							
							
						 | 
						
							2014-09-04 01:27:28 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	ad5a47aecf
						 | 
						
							
							
								
								
								add fetaure switch for acl-automention
							
							
							
							
							
						 | 
						
							2014-01-03 14:40:43 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b130c892b2
						 | 
						
							
							
								
								
								features categories were un-translatable
							
							
							
							
							
						 | 
						
							2012-11-28 19:25:09 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	a536a4e657
						 | 
						
							
							
								
								
								local stuff leaked
							
							
							
							
							
						 | 
						
							2012-11-22 09:21:21 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	04f5506318
						 | 
						
							
							
								
								
								forgot some slightly important files
							
							
							
							
							
						 | 
						
							2012-11-22 09:20:03 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |