adiabatic 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8dc66867e2 
							
						 
					 
					
						
						
							
							zweihander-macos: Update keys, add capslock ( #19730 )  
						
						... 
						
						
						
						* Update to current Scroll Lock/Power names
* Replace `'` with `⇪` 
						
						
					 
					
						2023-02-01 18:55:12 +00:00 
						 
				 
			
				
					
						
							
							
								adiabatic 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4f83b673bd 
							
						 
					 
					
						
						
							
							[Keymap] Improve Zweihander layout for the Ergodox EZ ( #18737 )  
						
						
						
						
					 
					
						2023-01-16 00:48:41 -08:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a87af0e9a 
							
						 
					 
					
						
						
							
							[Keymap] Drashna updates for 0.19 ( #19175 )  
						
						... 
						
						
						
						* Fix up bastardkb boards since blackpill support is officially added.
  * Check for blackpill version, not elite c.
  * Add checks in chibiOS config since multiple ARM controllers supported.
  * Rework rules.mk for keymaps to better handle arm vs avr support
* Start moving away from `matrix_*_*` functions.
  * `housekeeping_task_*` instead of `matrix_scan_*`
  * `keyboard_(pre|post)_init_*` instead of `matrix_init_*` 
* Add ℂℴmⅈℂ unicode input method.
* Clean up unicode code to be more compact and flexible.
* Remove/move Pro Micro LED commands to userspace and better filter them
* Fixup OLED code
  * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation
  * Make unicode mode render much more compact/simple.
* Make qmk secrets more self contained
* Remove custom implementation of split watchdog 
						
						
					 
					
						2022-11-29 11:43:42 -08:00 
						 
				 
			
				
					
						
							
							
								Nick Brassel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							219afaba42 
							
						 
					 
					
						
						
							
							Reworked backlight keycodes. ( #18961 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com> 
						
						
					 
					
						2022-11-06 08:11:59 +11:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fe18df9d41 
							
						 
					 
					
						
						
							
							Normalise Dynamic Macro keycodes ( #18939 )  
						
						... 
						
						
						
						* `DYN_REC_START1` -> `QK_DYNAMIC_MACRO_RECORD_START_1`
* `DYN_REC_START2` -> `QK_DYNAMIC_MACRO_RECORD_START_2`
* `DYN_MACRO_PLAY1` -> `QK_DYNAMIC_MACRO_PLAY_1`
* `DYN_MACRO_PLAY2` -> `QK_DYNAMIC_MACRO_PLAY_2`
* `DYN_REC_STOP` -> `QK_DYNAMIC_MACRO_RECORD_STOP`
* Update docs 
						
						
					 
					
						2022-11-03 23:01:06 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5974d989fe 
							
						 
					 
					
						
						
							
							Normalise Unicode keycodes ( #18898 )  
						
						... 
						
						
						
						* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`
* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`
* `UC_MAC` -> `UNICODE_MODE_MACOS`
* `UC_LNX` -> `UNICODE_MODE_LINUX`
* `UC_WIN` -> `UNICODE_MODE_WINDOWS`
* `UC_BSD` -> `UNICODE_MODE_BSD`
* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`
* `UC_EMACS` -> `UNICODE_MODE_EMACS`
* `UC__COUNT` -> `UNICODE_MODE_COUNT`
* `UC_M_MA` -> `UC_MAC`
* `UC_M_LN` -> `UC_LINX`
* `UC_M_WI` -> `UC_WIN`
* `UC_M_BS` -> `UC_BSD`
* `UC_M_WC` -> `UC_WINC`
* `UC_M_EM` -> `UC_EMAC`
* Docs
* Update quantum/unicode/unicode.h 
						
						
					 
					
						2022-10-31 21:15:12 +00:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							002b58f0e4 
							
						 
					 
					
						
						
							
							Normalise Space Cadet keycodes ( #18864 )  
						
						
						
						
					 
					
						2022-10-27 11:19:16 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7cbff9d921 
							
						 
					 
					
						
						
							
							Deprecate KC_LOCK for QK_LOCK ( #18796 )  
						
						
						
						
					 
					
						2022-10-21 15:46:10 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b33fc34967 
							
						 
					 
					
						
						
							
							Deprecate KC_LEAD for QK_LEAD ( #18792 )  
						
						
						
						
					 
					
						2022-10-21 14:25:54 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c347e732be 
							
						 
					 
					
						
						
							
							Remove legacy EEPROM clear keycodes ( #18782 )  
						
						... 
						
						
						
						* `EEP_RST` -> `EE_CLR`, default-ish keymaps
* `EEP_RST` -> `EE_CLR`, user keymaps
* `EEP_RST` -> `EE_CLR`, community layouts
* `EEP_RST` -> `EE_CLR`, userspace
* `EEP_RST` -> `EE_CLR`, docs & core 
						
						
					 
					
						2022-10-20 12:20:07 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bad8c5992b 
							
						 
					 
					
						
						
							
							Remove legacy sendstring keycodes ( #18749 )  
						
						
						
						
					 
					
						2022-10-17 13:45:23 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							74223c34a9 
							
						 
					 
					
						
						
							
							Remove legacy keycodes, part 6 ( #18740 )  
						
						... 
						
						
						
						* `KC_RSHIFT` -> `KC_RSFT`
* `KC_RCTRL` -> `KC_RCTL`
* `KC_LSHIFT` -> `KC_LSFT`
* `KC_LCTRL` -> `KC_LCTL` 
						
						
					 
					
						2022-10-16 14:14:40 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5e4b076af3 
							
						 
					 
					
						
						
							
							Remove legacy keycodes, part 5 ( #18710 )  
						
						... 
						
						
						
						* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM` 
						
						
					 
					
						2022-10-15 22:29:43 +01:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad8630bd72 
							
						 
					 
					
						
						
							
							Remove RGBLIGHT_ANIMATION and clean up effect defines for layouts+users ( #18729 )  
						
						
						
						
					 
					
						2022-10-15 09:59:31 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5629ba1807 
							
						 
					 
					
						
						
							
							Remove legacy keycodes, part 4 ( #18683 )  
						
						... 
						
						
						
						* `KC_PGDOWN` -> `KC_PGDN`
* `KC_PSCREEN` -> `KC_PSCR`
* `KC_SCOLON` -> `KC_SCLN`
* `KC_BSLASH` -> `KC_BSLS`
* `KC_BSPACE` -> `KC_BSPC` 
						
						
					 
					
						2022-10-13 18:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14b522bb34 
							
						 
					 
					
						
						
							
							Remove keymaps that still reference legacy macros ( #18690 )  
						
						
						
						
					 
					
						2022-10-13 02:22:16 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fb2c7da2fd 
							
						 
					 
					
						
						
							
							Remove some .gitignore files ( #18689 )  
						
						
						
						
					 
					
						2022-10-13 08:36:51 +11:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e96d829724 
							
						 
					 
					
						
						
							
							Remove legacy keycodes, part 3 ( #18669 )  
						
						... 
						
						
						
						* `KC__VOLDOWN` -> `KC_VOLD`
* `KC__VOLUP` -> `KC_VOLU`
* `KC__MUTE` -> `KC_MUTE`
* `KC_POWER` -> `KC_PWR` 
						
						
					 
					
						2022-10-11 14:21:47 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c6f1b594a2 
							
						 
					 
					
						
						
							
							Remove legacy keycodes, part 2 ( #18660 )  
						
						... 
						
						
						
						* `KC_SYSREQ` -> `KC_SYRQ`
And one `KC_ALT_ERASE` -> `KC_ERAS`
* `KC_NONUS_BSLASH` -> `KC_NUBS`
* `KC_NUMLOCK` -> `KC_NUM`
* `KC_CLCK` -> `KC_CAPS`
* `KC_SCROLLLOCK` -> `KC_SCRL`
* `KC_LBRACKET` -> `KC_LBRC`
* `KC_RBRACKET` -> `KC_RBRC`
* `KC_CAPSLOCK` -> `KC_CAPS` 
						
						
					 
					
						2022-10-10 20:06:26 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4b2d71de52 
							
						 
					 
					
						
						
							
							Remove legacy international keycodes ( #18588 )  
						
						
						
						
					 
					
						2022-10-09 14:51:09 +11:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d1b6b06202 
							
						 
					 
					
						
						
							
							Remove legacy locking caps/num/scroll keycodes ( #18601 )  
						
						
						
						
					 
					
						2022-10-05 16:21:40 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d983251c10 
							
						 
					 
					
						
						
							
							Switch over MANUFACTURER and PRODUCT to string literals ( #18183 )  
						
						
						
						
					 
					
						2022-08-28 09:59:40 -07:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bbc3bc55f2 
							
						 
					 
					
						
						
							
							RESET -> QK_BOOT user keymaps ( #17940 )  
						
						
						
						
					 
					
						2022-08-21 23:55:30 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							a949d32072 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2022-07-02 11:26:57 +00:00 
						 
				 
			
				
					
						
							
							
								Manna Harbour 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3842b15cf1 
							
						 
					 
					
						
						
							
							[Keymap] Update Miryoku ( #16482 )  
						
						
						
						
					 
					
						2022-07-02 21:26:23 +10:00 
						 
				 
			
				
					
						
							
							
								precondition 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3b9e186019 
							
						 
					 
					
						
						
							
							Do not enable PERMISSIVE_HOLD when TAPPING_TERM exceeds 500ms ( #15674 )  
						
						
						
						
					 
					
						2022-06-24 12:40:09 +02:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0da6562c4d 
							
						 
					 
					
						
						
							
							Make default layer size 16-bit ( #15286 )  
						
						... 
						
						
						
						Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> 
						
						
					 
					
						2022-06-19 07:37:51 +10:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cda343acbe 
							
						 
					 
					
						
						
							
							[Keymap] Drashna update for post Q2 merge ( #17241 )  
						
						
						
						
					 
					
						2022-05-30 22:02:55 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a8bd7b9a5 
							
						 
					 
					
						
						
							
							Rename keymap_extras headers for consistency ( #16939 )  
						
						
						
						
					 
					
						2022-05-15 21:27:01 +10:00 
						 
				 
			
				
					
						
							
							
								Nathan Johnson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							980a1b0562 
							
						 
					 
					
						
						
							
							[Keymap] ergodox: updating osx_whiskey_tango_foxtrot_capslock to use process_record_user ( #16715 )  
						
						
						
						
					 
					
						2022-03-23 22:24:02 -07:00 
						 
				 
			
				
					
						
							
							
								Olli 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c30bdcbca8 
							
						 
					 
					
						
						
							
							[Keymap] Remove Ergodox community layout “coderkun_neo2” ( #16011 )  
						
						
						
						
					 
					
						2022-01-23 12:38:02 -08:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b090ff03ed 
							
						 
					 
					
						
						
							
							[Keymap] Drashna's OLED rewrite ( #15981 )  
						
						
						
						
					 
					
						2022-01-21 19:36:52 -08:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c4551d7ef1 
							
						 
					 
					
						
						
							
							[Keymap] Reorganization, cleanup and readmes for drashna code ( #15617 )  
						
						
						
						
					 
					
						2021-12-29 20:17:34 -08:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3fa592a402 
							
						 
					 
					
						
						
							
							[Keymap] Unicode and Pointing Device and Autocorect for drashna keymaps ( #15415 )  
						
						
						
						
					 
					
						2021-12-14 20:53:36 -08:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							56e3f06a26 
							
						 
					 
					
						
						
							
							Rework and expand Pointing Device support ( #14343 )  
						
						... 
						
						
						
						Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> 
						
						
					 
					
						2021-11-14 22:03:24 -08:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							b4c5c56f58 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-11-05 18:28:07 +00:00 
						 
				 
			
				
					
						
							
							
								kototama 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							827115a4f6 
							
						 
					 
					
						
						
							
							[Keymap] Revamp the ergodox french_hacker layout ( #15064 )  
						
						
						
						
					 
					
						2021-11-05 11:27:48 -07:00 
						 
				 
			
				
					
						
							
							
								James Young 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							84ea77ead6 
							
						 
					 
					
						
						
							
							Remove BOOTMAGIC_ENABLE = lite option ( #15002 )  
						
						... 
						
						
						
						* remove BOOTMAGIC_ENABLE=lite setting
* change keyboard BOOTMAGIC_ENABLE rules
Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.
* change keyboard BOOTMAGIC_ENABLE inline comments
Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".
* change keymap BOOTMAGIC_ENABLE rules
Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.
* change keymap BOOTMAGIC_ENABLE inline comments
Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".
* change layout/user BOOTMAGIC_ENABLE rules/comments
Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.
Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".
* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/
* remove docs references to Full Bootmagic
* convert data-driven Bootmagic Lite instances
* remove Bootmagic Lite bodge from data-driven generation
* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a
* update docs/ja/config_options.md per mtei
* update docs/faq_misc.md per mtei
Remove remaining Full Bootmagic reference. 
						
						
					 
					
						2021-11-05 08:18:09 +11:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							928d9f90ec 
							
						 
					 
					
						
						
							
							Remove complex fn_actions macros ( #14662 )  
						
						... 
						
						
						
						* Remove complex `fn_actions` macros
* Remove additional `KC_FN*` instances 
						
						
					 
					
						2021-11-01 09:27:54 +11:00 
						 
				 
			
				
					
						
							
							
								Joel Challis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1816006121 
							
						 
					 
					
						
						
							
							Tidy up LCD_ENABLE/visualizer references ( #14855 )  
						
						... 
						
						
						
						* Tidy up LCD_ENABLE/visualizer references
* Fix up my (333fred) ergodox keymap with new LCD driver
Co-authored-by: Fredric Silberberg <fred@silberberg.xyz> 
						
						
					 
					
						2021-10-20 21:27:46 +01:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							ede6122ac6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-10-16 05:34:23 +00:00 
						 
				 
			
				
					
						
							
							
								Manna Harbour 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6b299fab6e 
							
						 
					 
					
						
						
							
							[Keymap] Update Miryoku ( #14827 )  
						
						
						
						
					 
					
						2021-10-15 22:33:45 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jael're 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e5662aa53d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-10-15 22:32:41 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9a0addc77e 
							
						 
					 
					
						
						
							
							[Keymap] Drashna Keymap Updates ( #14842 )  
						
						... 
						
						
						
						* Fix issues with user split transport code
* Improve OLED (More font stuff, improved keylogger, etc)
* Add `KEYLOCK` macro to disable USB, borrowed from command feature.
* Convert Kyria fully to proton C (no more AVR kyria)
* Add Work Louder Work Board keymap 
						
						
					 
					
						2021-10-15 22:30:23 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d8f0c8783a 
							
						 
					 
					
						
						
							
							Remove sysex API ( #14723 )  
						
						
						
						
					 
					
						2021-10-06 19:34:46 +11:00 
						 
				 
			
				
					
						
							
							
								Zach White 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fce9cb9338 
							
						 
					 
					
						
						
							
							Cleanup issues identified by lgtm ( #14459 )  
						
						... 
						
						
						
						* cleanup issues identified by lgtm
* fix the git_status check 
						
						
					 
					
						2021-09-27 10:02:54 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jaelre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							58a5030661 
							
						 
					 
					
						
						
							
							[Keymap] Drashna's Improve OLEDs and custom Split code ( #14063 )  
						
						... 
						
						
						
						* Fill the oleds with right mods
* Enable double mods on x32 oleds
* Disable forced NKRO
* Make oleds fancy only on good MCUs
* Overhaul oled display
* Further enhance oled, with kitty!
* Final oled form
* Not working transport
* Transport id of woring
* Add acceleration
* fix button placement for accel macro
* Fix accelartion location and behavior
* Remove OLED sync code
* Fix alignment issue
* Remove audio hack
* Fix up zima keymap
* Add matrix slave scan function and cleanup drashna.h
* Clean up user space
* Allow userspace sync to be disable-able
* Fix weird issue with audio
* Fix alignment issue with user split sync
* Disable second rgb matrix task
* Disable additional animations
* Change dynamic keymap settings
* Hacky fix for borked corne
* Add Blackpill (F411) support to tractyl manuform
* remove manual via eeprom reset
* Remove all references to rgblight twinkle
* Fix issues with config processing 
						
						
					 
					
						2021-08-21 13:34:44 -07:00 
						 
				 
			
				
					
						
							
							
								QMK Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							e80772da40 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-08-14 01:15:07 +00:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ade989962a 
							
						 
					 
					
						
						
							
							[Keymap] clean up userspace, add XD75 / Keyboardio Atreus ( #13121 )  
						
						... 
						
						
						
						Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com> 
						
						
					 
					
						2021-08-13 18:14:21 -07:00 
						 
				 
			
				
					
						
							
							
								Drashna Jael're 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8e8ec6338c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2021-08-12 09:18:18 -07:00