Merge branch 'master'
Conflicts:
keyboards/planck/keymaps/bone2planck/keymap.c
Merge pull request #703 from jhenahan/feature/jhenahan-keymap
jhenahan Planck layout
Merge pull request #700 from algernon/h/ucis/enable-fix
build_keyboard.mk: Restore UCIS_ENABLE support
build_keyboard.mk: Restore UCIS_ENABLE support
During the build system refactor, support for enabling UCIS seems to
have been lost. This little patch adds that back, so that keymaps using
UCIS can be compiled again.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Merge pull request #697 from fredizzimo/fix_gh_token_problem
Fix the .travis.yml so that GH_TOKEN works properly
Merge pull request #696 from fredizzimo/community_boards
Update list of community keyboards
Fix the .travis.yml so that GH_TOKEN works properly
Update list of community keyboards
Merge pull request #689 from jeebak/tv44-jeebak
Port jeebak's Planck/JD45 keymap to TV44
Merge pull request #684 from tomb0y/kc60_workman_dead
Correct typo in kc60 workman-dead keymap
Merge pull request #695 from fredizzimo/dfu-util_instructions
Add dfu-util to the instructions
Merge pull request #693 from fredizzimo/infinity60
Rename infinity_chibios to infinity60, and add readme
Merge pull request #694 from fredizzimo/keyboard_template
Fix the keyboard template with new make syntax
Merge pull request #690 from fredizzimo/unit_test
Add Unit Testing support
Rename infinity_chibios to infinity60, and add readme
Add dfu-util to the instructions
Fix the keyboard template with new make syntax
Also add proper link to the parent
Add unit test documentation