Merge remote-tracking branch 'upstream/master'

2017-06-22 13:06:30 -05:00
parent 4b50ab029d 2b98ec67f3
commit fa96d64f37
485 changed files with 9754 additions and 25860 deletions
--- a/keyboards/ergodox/keymaps/familiar/README.md
+++ b/keyboards/ergodox/keymaps/familiar/README.md
@@ -45,7 +45,7 @@ $ make ergodox-ez-familiar-teensy

 ## Usage

-[![Familiar Layout](familiar.png)](http://www.keyboard-layout-editor.com/#/gists/13508a9f99cff381d58b7be6f7dcc644)
+[![Familiar Layout](https://i.imgur.com/jflmkBb.png)](http://www.keyboard-layout-editor.com/#/gists/13508a9f99cff381d58b7be6f7dcc644)

 ### Layers
 1. Base Layer: QWERTY, with arrow keys at bottom right.
--- a/keyboards/ergodox/keymaps/familiar/familiar.png
+++ b/keyboards/ergodox/keymaps/familiar/familiar.png