| 
							
							
								 redmatrix | 9abd95fad3 | static App | 2016-03-31 16:06:03 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | cd2b811555 | move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. | 2015-09-26 23:44:30 -07:00 |  | 
			
				
					| 
							
							
								 Alexander Kampmann | 355c42cb30 | Merge branch 'master' of https://github.com/friendica/friendica Conflicts:
	include/config.php
	update.php | 2012-04-05 13:39:15 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 8aa2552372 | add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) | 2012-01-18 16:21:30 -08:00 |  | 
			
				
					| 
							
							
								 Fabio Comuni | fd4256a13f | php2po script | 2011-03-18 11:03:15 +01:00 |  |