| 
							
							
								 Balz Guenat | d18df8ef7a | Merge remote-tracking branch 'upstream/master' into bananasplit # Conflicts:
#	keyboards/bananasplit/Makefile
#	keyboards/bananasplit/bananasplit.c
#	keyboards/bananasplit/bananasplit.h
#	keyboards/bananasplit/config.h
#	keyboards/bananasplit/keymaps/default/keymap.c
#	keyboards/bananasplit/rules.mk | 2017-08-07 21:54:06 +02:00 |  |