Merge branch 'master' into development

83c217b8 · Jay Ta'ala · 94672bcb · 1701a814 · 83c217b8
Commit 83c217b8 authored Feb 09, 2019 by Jay Ta'ala
--- a/i3/config
+++ b/i3/config
@@ -361,7 +361,6 @@ exec --no-startup-id conky -c ~/.config/conky_shortcuts
 exec --no-startup-id xautolock -time 10 -locker blurlock
 exec_always --no-startup-id ff-theme-util
 exec_always --no-startup-id fix_xcursor
-exec --no-startup-id indicator-keylock
 exec --no-startup-id fcitx -d
 exec --no-startup-id alttab -fg "#d58681" -bg "#4a4a4a" -frame "#eb564d" -t 128x150 -i 127x64