Merge branch 'master' of github.com:chrys87/fenrir
This commit is contained in:
		@@ -54,7 +54,7 @@ respectPunctuationPause=True
 | 
			
		||||
newLinePause=True
 | 
			
		||||
numberOfClipboards=10
 | 
			
		||||
emoticons=True
 | 
			
		||||
fenrirKeys=KEY_KP0
 | 
			
		||||
fenrirKeys=KEY_KP0,KEY_META
 | 
			
		||||
scriptKey=KEY_COMPOSE
 | 
			
		||||
timeFormat=%H:%M:%P
 | 
			
		||||
dateFormat="%A, %B %d, %Y"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user