Ibnu Daru Aji 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d5f3f7c126 
								
							 
						 
						
							
							
								
								[Keyboard] corrected VID/PID and layout for squiggle ( #11198 )  
							
							 
							
							... 
							
							
							
							* corrected the pid and added a new layout.
* following drashna's suggestion. 
							
						 
						
							2020-12-22 21:53:14 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								bdc3578e29 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-23 05:35:04 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rustam Zagirov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9ed5d7571 
								
							 
						 
						
							
							
								
								ergodox_ez/stamm update ( #11236 )  
							
							 
							
							
							
						 
						
							2020-12-23 16:34:33 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								19fd0108d3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-23 04:02:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								806aa9bc67 
								
							 
						 
						
							
							
								
								Remove comments about custom ldscript for Teensy LC ( #11224 )  
							
							 
							
							
							
						 
						
							2020-12-23 15:01:44 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								529dad88dd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-23 02:50:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Takeshi ISHII 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc7081a823 
								
							 
						 
						
							
							
								
								[Keymap] fix and update helix/rev3_5rows:five_rows ( #11191 )  
							
							 
							
							... 
							
							
							
							* [Keymap] fix and update helix/rev3_5rows:five_rows
* fix rgblight animation selection
* use `DEBUG_MATRIX_SCAN_RATE_ENABLE` insted of keyboard_post_init_user_scan.c
* Change the initial value of the ENCODER_ENABLE to 'no' in 'keymaps/five_rows/rules.mk'
* Add 'HELIX=debug/no-debug' option into 'rev3_5rows/keymaps/five_rows/rules.mk'
* Add '#define OLED_UPDATE_INTERVAL 100' 'rev3_5rows/keymaps/five_rows/config.h'
* add LED_ANIMATIONS_LEVEL macro into rev3_5rows/keymaps/five_rows/
* Change OLED_UPDATE_INTERVAL value in rev3_5rows/keymaps/five_rows/config.h 
							
						 
						
							2020-12-23 11:50:12 +09:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								b02c694992 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-23 00:45:29 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Reza Jelveh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd177582ad 
								
							 
						 
						
							
							
								
								chibios: honor PLATFORMASM in chibios build ( #11219 )  
							
							 
							
							
							
						 
						
							2020-12-23 11:44:49 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								dc6b0d3548 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 21:05:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Kishor Prins 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dee506c096 
								
							 
						 
						
							
							
								
								Updated Raw HID docs to clarify packet/report length ( #11211 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-23 08:04:55 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								1c04608b0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 20:33:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								78b2f120e5 
								
							 
						 
						
							
							
								
								V-USB: Fix initial dropped keypress ( #11263 )  
							
							 
							
							
							
						 
						
							2020-12-23 07:33:04 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								47db2d3062 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 19:29:09 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									SpacebarRacecar 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce7d3855f4 
								
							 
						 
						
							
							
								
								Update to personal keymaps ( #11171 )  
							
							 
							
							
							
						 
						
							2020-12-23 06:28:34 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								286ab6d53f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 19:28:03 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nathan13888 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4eebefada7 
								
							 
						 
						
							
							
								
								[Keyboard] YMD75 rev 3:  fix BACKLIGHT_PIN ( #11172 )  
							
							 
							
							... 
							
							
							
							* YMD75 rev 3:  fix BACKLIGHT_PIN
Update backlight LED pin used by QMK to control the per-key backlight for YMD75 rev 3
* YMD75 rev 3: fix BACKLIGHT_PIN - fix comments
* YMD75: move BACKLIGHT_PIN definitions to the respective versions
Signed-off-by: Nathan13888 <29968201+Nathan13888@users.noreply.github.com> 
							
						 
						
							2020-12-22 11:27:27 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sendy Aditya Suryana 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b06ab51e5 
								
							 
						 
						
							
							
								
								[Keyboard] Add Pix ( #11154 )  
							
							 
							
							... 
							
							
							
							* Add nakal4x keyboard firmware
* Fix VIA config
* Setup OLED
* Rename to pix
* Rename via.json to info.json
* Update keyboards/sendyyeah/pix/config.h
remove obsolete value as suggested by drashna
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add GPL Like license header
* Remove unused bootloader list
* Change URL
* Update readme
* Delete via info.json
* Add GPL2+ license header on via keymap
* Update keyboards/sendyyeah/pix/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/sendyyeah/pix/keymaps/default/glcdfont.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add GPL2+ license header on via keymap
* Add image
* Remove local drivers
* Remove unused method on keymap files
* Change project name on keymap readme files
* Update keyboards/sendyyeah/pix/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/sendyyeah/pix/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/sendyyeah/pix/keymaps/default/glcdfont.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/sendyyeah/pix/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/sendyyeah/pix/keymaps/via/keymap.c
Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-22 11:20:09 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								3dde354736 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 18:40:06 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									cjcodell1 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71b52416d8 
								
							 
						 
						
							
							
								
								[Keyboard] Add Nimrod ( #11141 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-22 19:39:29 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								824175e69c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 18:11:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dmitry Nosachev 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf324c38e3 
								
							 
						 
						
							
							
								
								[Keyboard] add ASkeyboard Sono1 ( #11114 )  
							
							 
							
							... 
							
							
							
							* handwired/sono1
* readme: addition
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-22 10:10:56 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								603d5fbeb1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 17:52:34 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joshua Diamond 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f40b564683 
								
							 
						 
						
							
							
								
								Partial fix for Issue  #9405  - Caps Lock not working with Unicode Map's XP on Linux ( #11232 )  
							
							 
							
							
							
						 
						
							2020-12-23 04:51:47 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								325179eb63 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 17:40:46 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2843e7f995 
								
							 
						 
						
							
							
								
								[Keyboard] Add VIA keymap for the reviung41 ( #11102 )  
							
							 
							
							... 
							
							
							
							* Add VIA keymap for reviung41
* Change VID for compatibility
* Add GPL header to config.h
* Enable link time optimization
* Remove config since it might not be needed 
							
						 
						
							2020-12-22 09:40:04 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								96a5e560d7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 17:23:53 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Joshua Diamond 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54e2bf3ede 
								
							 
						 
						
							
							
								
								Fix Issue  #9533  - Delayed shift state handling ( #11220 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-22 18:23:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								71fcfb3cb5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-22 09:15:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kb-elmo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9453573080 
								
							 
						 
						
							
							
								
								[Keyboard] Add Axolstudio Yeti ( #11051 )  
							
							 
							
							
							
						 
						
							2020-12-22 01:14:28 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								8f867c1bef 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-21 14:39:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach White 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c0dcee96a8 
								
							 
						 
						
							
							
								
								Initial list of keyboards to exclude from CI ( #11213 )  
							
							 
							
							
							
						 
						
							2020-12-21 15:38:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								37bb69686c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-21 14:35:14 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ben 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e0718a3b7 
								
							 
						 
						
							
							
								
								[Keyboard] add Lily58L keymap ( #9870 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-21 15:34:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								210e614d2a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-21 12:30:13 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erovia 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a380a26ad2 
								
							 
						 
						
							
							
								
								Split of the doctor codebase ( #11255 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2020-12-21 13:29:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Brassel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								296a6cf4ea 
								
							 
						 
						
							
							
								
								ChibiOS conf migrations... take 3 ( #11261 )  
							
							 
							
							... 
							
							
							
							* Add SPI1 DMA stream definitions.
* ChibiOS conf upgrade for acheron/lasgweloth
 acheron/lasgweloth - 3bedb0fe1f1b542b4d90daeaeab8905cd9ee992c
* ChibiOS conf upgrade for box75
 box75 - ff91bacf5cec0b42df02967eb0ecbf4bd1b56928
* ChibiOS conf upgrade for geekboards/macropad_v2
 geekboards/macropad_v2 - 1c205720d47f7e636173064b1aef1637860a9134
* ChibiOS conf upgrade for iron180
 iron180 - 867929d78361a50e34671e4e167cafd927d8982b
* ChibiOS conf upgrade for technika
 technika - cb9295b90980eb8dfdc63d6031533edbb344c045 
							
						 
						
							2020-12-21 15:02:38 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								c8cd2caeac 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-21 02:12:40 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e3211e307e 
								
							 
						 
						
							
							
								
								Fix small typo in V-USB configuration descriptor ( #11253 )  
							
							 
							
							
							
						 
						
							2020-12-21 13:12:07 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d7385676bc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-20 14:46:35 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ryan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0239ce025a 
								
							 
						 
						
							
							
								
								Doctor: add check for .git folder ( #11208 )  
							
							 
							
							... 
							
							
							
							Co-authored-by: Erovia <Erovia@users.noreply.github.com> 
							
						 
						
							2020-12-20 15:46:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								aee1798476 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-20 08:09:09 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nick Brassel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								13bbeefc5a 
								
							 
						 
						
							
							
								
								Follow symlinks when listing keyboards. ( #11250 )  
							
							 
							
							
							
						 
						
							2020-12-20 19:08:39 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								24e827ee1f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-20 02:28:28 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Takeshi ISHII 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								63362a9c5e 
								
							 
						 
						
							
							
								
								[Keymap] fix keyboards/helix/rev2/keymaps/default/oled_display.c ( #11228 )  
							
							 
							
							... 
							
							
							
							Fixed the OLED display on the right side as it was showing some garbage.
右側のOLEDディスプレイにゴミが表示されていたのを修正しました。 
							
						 
						
							2020-12-20 13:27:54 +11:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								8cb52b2048 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-19 21:15:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									MechMerlin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25b1367806 
								
							 
						 
						
							
							
								
								VIA Support: MF68 ( #11030 )  
							
							 
							
							... 
							
							
							
							* add via support to mf68 pcb
* add license header 
							
						 
						
							2020-12-19 13:14:41 -08:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								32f53c0671 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-19 18:47:05 +00:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach White 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								624cafbfd2 
								
							 
						 
						
							
							
								
								Change keyboard json format to bring it inline with the current api ( #11231 )  
							
							 
							
							
							
						 
						
							2020-12-19 19:46:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									QMK Bot 
								
							 
						 
						
							
							
							
							
								
							
							
								d11116f734 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							 
							
							
							
						 
						
							2020-12-19 18:43:32 +00:00