forked from GNUsocial/gnu-social
		
	Merge branch 'locshunt2' into 0.9.x
Conflicts: classes/User_location_prefs.php
This commit is contained in:
		@@ -45,4 +45,9 @@ class User_location_prefs extends Memcached_DataObject
 | 
			
		||||
 | 
			
		||||
    /* the code above is auto generated do not remove the tag below */
 | 
			
		||||
    ###END_AUTOCODE
 | 
			
		||||
 | 
			
		||||
    function sequenceKey()
 | 
			
		||||
    {
 | 
			
		||||
        return array(false, false, false);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user