Merge branch 'master' of git://github.com/friendika/friendika
This commit is contained in:
		| @@ -136,13 +136,13 @@ $sexual | ||||
|  | ||||
| <div id="profile-edit-pubkeywords-wrapper" > | ||||
| <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label> | ||||
| <input type="text" size="32" name="pubkeywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" /> | ||||
| <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" /> | ||||
| </div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div> | ||||
| <div id="profile-edit-pubkeywords-end"></div> | ||||
|  | ||||
| <div id="profile-edit-prvkeywords-wrapper" > | ||||
| <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label> | ||||
| <input type="text" size="32" name="prvkeywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> | ||||
| <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> | ||||
| </div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div> | ||||
| <div id="profile-edit-prvkeywords-end"></div> | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user