gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-11 12:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,367 Commits 63 Branches 1,613 Tags 1.2 GiB
ea36c25732
Commit Graph

13715 Commits

Author SHA1 Message Date
Mario Cadenas
93f0c1f32f
[Keymap] Add new keymap to nasu (#18024) 2022-08-21 12:03:48 -07:00
QMK Bot
67c44c2a2b Merge remote-tracking branch 'origin/develop' into xap 2022-08-21 00:18:47 +00:00
QMK Bot
efd893be39 Merge remote-tracking branch 'origin/master' into develop 2022-08-21 00:18:07 +00:00
Louis Dalibard
7ea54a7837
[Keyboard] Add ai macropad (#17722) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Louis Dalibard <ontake@ontake.dev>
 2022-08-20 17:17:02 -07:00
QMK Bot
4f55e3d4f1 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 20:29:18 +00:00
QMK Bot
f99bac052e Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:28:43 +00:00
Abigail
e2fbcc8099
added keymap for kprepublic/jj40:brdlf (#17961) 
* added keymap for kprepublic/jj40:brdlf
 2022-08-20 21:28:02 +01:00
QMK Bot
4c16370516 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 20:22:16 +00:00
QMK Bot
e3cf678569 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:21:44 +00:00
JX
706995c044
[Keyboard] Add yandrstudio/nz67v2 keyboard. (#17591) 
* add yr nz67v2 by jiaxin96
 2022-08-20 21:21:07 +01:00
QMK Bot
ea921d873d Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 20:09:09 +00:00
QMK Bot
cb3c8f40d0 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:08:35 +00:00
QMK Bot
d93b5ef247
Format code according to conventions (#18119) 2022-08-20 21:07:57 +01:00
QMK Bot
5157df5746 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 20:02:16 +00:00
QMK Bot
aa7629f8e6 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:01:40 +00:00
bojiguard
5222cf7673
add fungo keyboard (#17513) 
by bojiguard
 2022-08-20 21:01:04 +01:00
QMK Bot
ad47d67a81 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 20:01:02 +00:00
QMK Bot
3609c24df4 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 20:00:24 +00:00
studiokestra
ce19a9cdc5
Add Nascent keyboard support. (#17824) 
* Add nascent keyboard by studiokestra
 2022-08-20 20:59:47 +01:00
QMK Bot
c9e457e620 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 18:46:42 +00:00
QMK Bot
a580057422 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 18:46:12 +00:00
mechlovin
c2a46a6fa0
[Keyboard] Add Zed65 (#17917) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-20 11:45:38 -07:00
QMK Bot
0b27f39455 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 17:23:40 +00:00
Drashna Jael're
8f6b019dcc
Merge remote-tracking branch 'origin/master' into develop 2022-08-20 10:22:48 -07:00
Joel Challis
d2accb48e7
RESET -> QK_BOOT keyboard readme (#18110) 2022-08-20 11:34:17 +01:00
QMK Bot
94702f6f67 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 04:18:28 +00:00
QMK Bot
3bf36e8b04 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 04:17:48 +00:00
Joe Scotto
e7107691ab
[Keymap] Add joe_scotto keymap for CRKBD (#18103) 2022-08-19 21:17:09 -07:00
QMK Bot
a9aacc0310 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 03:53:04 +00:00
QMK Bot
68079cba61 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 03:52:33 +00:00
Drashna Jaelre
f08e08cec2
[Keyboard] Fix compilation issues for keycapsss kimiko (#18112) 2022-08-20 13:51:57 +10:00
QMK Bot
7740c3754d Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 02:59:44 +00:00
QMK Bot
a69303bb78 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 02:59:05 +00:00
Davide Masserut
c9120ea8e9
[Keymap] Add Miryoku keymap for Hillside family (#18087) 2022-08-19 19:58:24 -07:00
QMK Bot
bb33765db5 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 01:56:14 +00:00
QMK Bot
880ea06760 Merge remote-tracking branch 'origin/master' into develop 2022-08-20 01:55:33 +00:00
AliceH66
85831fc188
[Keyboard] Add aliceh66 pianoforte (#18081) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-19 18:55:01 -07:00
QMK Bot
454891e583 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 00:56:45 +00:00
fauxpark
61689ae609 Merge remote-tracking branch 'upstream/master' into develop 2022-08-20 10:55:40 +10:00
Ryan
201f1a8f47
Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093) 2022-08-20 01:48:38 +01:00
Ryan
f4dcce7e59
Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090) 2022-08-20 01:45:28 +01:00
Ryan
201a914beb
Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) 2022-08-20 01:42:49 +01:00
Ryan
835c971f78
Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) 2022-08-20 10:39:35 +10:00
QMK Bot
ca69c7ce3b Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 00:32:54 +00:00
QMK Bot
eceed6c50b Merge remote-tracking branch 'origin/master' into develop 2022-08-20 00:32:18 +00:00
Ryan
48792b030b
Move keyboard USB IDs and strings to data driven, pass 2: handwired (#18079) 2022-08-20 10:31:48 +10:00
QMK Bot
2a45e4f83b Merge remote-tracking branch 'origin/develop' into xap 2022-08-19 23:50:43 +00:00
QMK Bot
f1ac92ac63 Merge remote-tracking branch 'origin/master' into develop 2022-08-19 23:50:09 +00:00
Drashna Jaelre
39f0fb7bea
[Keyboard] Update Work Louder keyboards (#18109) 2022-08-19 16:49:37 -07:00
QMK Bot
c0fedaf7f3 Merge remote-tracking branch 'origin/develop' into xap 2022-08-19 22:16:13 +00:00
QMK Bot
4a8bed844d Merge remote-tracking branch 'origin/master' into develop 2022-08-19 22:15:34 +00:00
Joel Challis
f1786cbd7b
Fix duplicate keys in info.json files (#18107) 2022-08-19 23:14:38 +01:00
QMK Bot
c194357e93 Merge remote-tracking branch 'origin/develop' into xap 2022-08-19 19:49:19 +00:00
QMK Bot
c0c875d675 Merge remote-tracking branch 'origin/master' into develop 2022-08-19 19:48:31 +00:00
yiancar
8e8c0e2d57
Cyberstar Custom (#18076) 
* Create Cyberstar Custom

Co-authored-by: yiancar <yiancar@gmail.com>
 2022-08-19 20:47:45 +01:00
QMK Bot
19d54b2070 Merge remote-tracking branch 'origin/develop' into xap 2022-08-18 00:24:09 +00:00
HorrorTroll
227e552f5c
Add support keyboard Feker IK75 (#17611) 2022-08-18 01:23:34 +01:00
QMK Bot
cf05b85a96 Merge remote-tracking branch 'origin/develop' into xap 2022-08-18 00:02:26 +00:00
David Hoelscher
a645301c82
Add Bonsai C4 converter (#17711) 2022-08-18 01:01:54 +01:00
QMK Bot
8a17194f2d Merge remote-tracking branch 'origin/develop' into xap 2022-08-17 22:52:09 +00:00
QMK Bot
29f47f4cf3 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 22:51:34 +00:00
jack
9607b46756
Fixup mokey/ibis80 keymaps (#18088) 2022-08-17 23:51:04 +01:00
QMK Bot
fb39709e3b Merge remote-tracking branch 'origin/develop' into xap 2022-08-17 07:28:47 +00:00
QMK Bot
47e98e3a68 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 07:28:11 +00:00
QMK Bot
c125a08147 Merge remote-tracking branch 'origin/develop' into xap 2022-08-17 07:27:48 +00:00
CoffeeIsLife
0df97fc968
[Keymap] Add personal keymap for kprepublic BM40HSRGB (#18021) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Fae <faenkhauser@gmail.com>
 2022-08-17 00:27:31 -07:00
ZhaoYou
6b78d07e64
[Keyboard] add 'soda/cherish' (#18057) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-17 00:26:35 -07:00
QMK Bot
823af9915f Merge remote-tracking branch 'origin/develop' into xap 2022-08-17 02:38:37 +00:00
QMK Bot
39337373f5 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 02:38:02 +00:00
Runheme
e5f1d8859e
[Keyboard] Add ibis80 (#18051) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-16 19:37:57 -07:00
QMK Bot
55048b2492 Merge remote-tracking branch 'origin/develop' into xap 2022-08-17 02:37:45 +00:00
QMK Bot
2ade237e77 Merge remote-tracking branch 'origin/master' into develop 2022-08-17 02:37:40 +00:00
Toshihiro Suzuki
5a1a0e71de
[Keymap] toshi0383 keymaps update (#18073) 2022-08-16 19:37:29 -07:00
QMK Bot
cafab40d55 Merge remote-tracking branch 'origin/develop' into xap 2022-08-16 17:24:11 +00:00
QMK Bot
7014e1efa3 Merge remote-tracking branch 'origin/master' into develop 2022-08-16 17:23:31 +00:00
yiancar
c834608a74
Fix WS2812 order for aurora65 and loki65 (#18074) 2022-08-16 18:22:47 +01:00
QMK Bot
2696aad2d9 Merge remote-tracking branch 'origin/develop' into xap 2022-08-16 14:29:57 +00:00
QMK Bot
9f0925fb18 Merge remote-tracking branch 'origin/master' into develop 2022-08-16 14:29:11 +00:00
Joel Challis
164faf0a5c
Use correct board file in xelus/valor_frl_tkl/rev2_0 (#18071) 2022-08-16 15:28:22 +01:00
QMK Bot
4e9e2dba1b Merge remote-tracking branch 'origin/develop' into xap 2022-08-15 17:56:37 +00:00
QMK Bot
904df296b0 Merge remote-tracking branch 'origin/master' into develop 2022-08-15 17:55:58 +00:00
Joel Challis
e44b6242b7
Migrate more F4x1 board files (#18054) 2022-08-15 18:55:21 +01:00
QMK Bot
c13cb1e1f0 Merge remote-tracking branch 'origin/develop' into xap 2022-08-15 13:21:58 +00:00
jack
5e6175a553
Fixup gmmk/pro/rev2 USB Data (#18056) 2022-08-15 23:21:15 +10:00
QMK Bot
1e90fd9fa0 Merge remote-tracking branch 'origin/develop' into xap 2022-08-15 09:16:44 +00:00
QMK Bot
1ccfed483d Merge remote-tracking branch 'origin/master' into develop 2022-08-15 09:15:56 +00:00
Ryan
b297a347bb
ADB to USB converter: split into rev1 and rev2 (#18052) 2022-08-15 10:15:22 +01:00
QMK Bot
94bee39909 Merge remote-tracking branch 'origin/develop' into xap 2022-08-15 07:56:55 +00:00
fauxpark
c202602938 Merge remote-tracking branch 'upstream/master' into develop 2022-08-15 17:54:07 +10:00
Ryan
51d5aad25b
Move keyboard USB IDs and strings to data driven, pass 2: D-E (#17956) 2022-08-15 13:30:12 +10:00
Ryan
1027aed83a
Move keyboard USB IDs and strings to data driven, pass 2: F-I (#17958) 2022-08-15 02:53:19 +01:00
QMK Bot
b3f205c161 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 23:55:40 +00:00
QMK Bot
5334614e8a Merge remote-tracking branch 'origin/master' into develop 2022-08-14 23:55:05 +00:00
PeterFalken
4c91e5bef8
Allow disabling RGB_MATRIX_ANIMATIONS system76 keyboards (#17478) 2022-08-14 19:54:25 -04:00
QMK Bot
a7d9432972 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 23:27:10 +00:00
QMK Bot
630de240b4 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 23:26:34 +00:00
Joel Challis
93fb69fbda
Migrate more F4x1 board files (#18046) 2022-08-15 00:25:40 +01:00
QMK Bot
d2c8ff71ea Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 19:43:59 +00:00
QMK Bot
74b4bcb607 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 19:43:25 +00:00
Alberto
3d3e463598
Feat/port ft mars 65 (#17994) 
* by wonderbeel
 2022-08-14 20:42:58 +01:00
QMK Bot
418103ebc0 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 19:27:16 +00:00
QMK Bot
e6a522417a Merge remote-tracking branch 'origin/master' into develop 2022-08-14 19:26:44 +00:00
Cyn
5f74ae5b63
Improve Drop Alt compatibility with VIA (#18041) 
by slycedix
 2022-08-14 20:26:06 +01:00
QMK Bot
be8f10a1c1 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 16:04:13 +00:00
Drashna Jaelre
9f31fcace3
[Keyboard] Fix compilation issues for Boardsource Microdox (#18037) 2022-08-14 17:03:40 +01:00
QMK Bot
38ac75cfff Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 08:55:12 +00:00
Drashna Jael're
ac31e42974
Merge remote-tracking branch 'origin/master' into develop 2022-08-14 01:54:23 -07:00
Xelus22
4195eb8fe1
[Keyboard] Add Valor FRL TKL rev2.0 and 2.1 (#17992) 
* add valor frl tkl rev2 by xelus22
 2022-08-14 08:17:11 +01:00
QMK Bot
12bd995163 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 04:00:53 +00:00
Joy Lee
e948fa6f6e
Added support for gmmk pro rev2 keyboard. (#17655) 
Co-authored-by: Joy <chang.li@westberrytech.com>
 2022-08-14 14:00:12 +10:00
Ryan
3a7dbc8981
Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) 2022-08-14 12:16:16 +10:00
QMK Bot
dd92e4ebe4 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 01:10:09 +00:00
QMK Bot
5c805e4cc5 Merge remote-tracking branch 'origin/master' into develop 2022-08-14 01:09:31 +00:00
Gary Kong
28b05d15ff
[Keyboard] add bajjak keyboard (#12377) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2022-08-13 18:08:46 -07:00
QMK Bot
cd9979bac6 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 00:55:36 +00:00
JJ48
4eda139b83
Add Gentleman 65 SE Solderd PCB support (#16992) 2022-08-14 01:55:03 +01:00
QMK Bot
ed90fe78b4 Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 00:47:46 +00:00
QMK Bot
50ff52639f Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:47:42 +00:00
Ryan
3079691391
Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A (#17941) 2022-08-13 17:47:05 -07:00
QMK Bot
b44c3f92ae Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:47:05 +00:00
Marko Skakun
0f1bb982e9
[Keyboard] Added different wiring of dactyl (#17997) 2022-08-13 17:46:35 -07:00
QMK Bot
3b75887dac Merge remote-tracking branch 'origin/develop' into xap 2022-08-14 00:37:17 +00:00
QMK Bot
4faf0ccaec Merge remote-tracking branch 'origin/master' into develop 2022-08-14 00:36:47 +00:00
Less/Rikki
ca2d05f5c6
[Keyboard] jacky_studio/piggy60 (#18012) 2022-08-13 17:36:11 -07:00
QMK Bot
4c676341c7 Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 20:27:20 +00:00
QMK Bot
b1c7df9a68 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 20:26:43 +00:00
Jesus Climent
cbcb4f2ec0
[Keyboard] Added Atreyu keyboard. (#17698) 
* Add Atreyu keyboard.

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-13 21:26:05 +01:00
QMK Bot
86f98023ab Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 20:16:49 +00:00
QMK Bot
8fd7825007 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 20:16:08 +00:00
mechlovin
1eecdb502d
[Keyboard] Add Foundation to QMK (#17573) 
* add mechlovin foundation keyboard

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-13 21:15:35 +01:00
QMK Bot
9e082f18da Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 20:13:36 +00:00
QMK Bot
7dca40f5af Merge remote-tracking branch 'origin/master' into develop 2022-08-13 20:13:03 +00:00
p4yne
40676d058e
[Keymap] adding new user (p4yne) layout with complex lighting feature… (#16085) 
* [Keymap] adding new user (p4yne) layout with complex lighting features (per layer, per key, per type) and usefull layers DE/US, etc.

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-13 21:12:31 +01:00
QMK Bot
958e9c4880 Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 19:48:53 +00:00
QMK Bot
bcd021263e Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:48:14 +00:00
emlah
a49bdd2659
add BAMFK-4 (#17985) 
* add BAMFK-4
 2022-08-13 20:47:39 +01:00
QMK Bot
e153496dd0 Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 19:45:36 +00:00
QMK Bot
97b610e166 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:45:00 +00:00
3araht
e145c7ad3f
Bandominedoni version output feature and a new keymap added (#17947) 
* SPLIT_USB_DETECT added.

* lednotg keymap added.

* lednotg missing modification fixed.

* VERSION is available.

* USER00 is used instead of SAFE_RANGE in via/keymap.c
 2022-08-13 20:44:29 +01:00
QMK Bot
dd17ef8ca6 Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 19:39:54 +00:00
QMK Bot
f417ffff5a Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:39:19 +00:00
Shem Sedrick
95782691d4
Dactyl Manuform 4x5 with 5 thumb cluster (#17671) 
* Working on new dactyl

* Preliminary build and keymap in place for 4x5_5 dactyl manuform

* Removing first attempt to use 4x5

* Updating to match c style guide

* Fixing issues after merge, deletion of dactyl_manuform.h

* Spliting out custom keymap

* Adding license headers

* Fixing EE_HANDS detection on Pro-Micro

The pro-micro was not working when I plugged into the elite-c on the
right hand side of my keyboard. Adding the SPLIT_USB_DIRECT definition
fixed the issue.

* Apply suggestions from code review

Adding Drashna's delete comments

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Removed config.h for keymaps and tweaked keymap

Per Drashna's pr review, I have removed the config.h files for the
keymaps.
Also tweaked my keymap to switch backspace and enter. Added tapping
toggle for RAISE.

* Further tweaking ssedrick keymap for dactyl_manuform 4x5_5

As with most new keyboards, they take some getting used to.
I've rearranged my thumb cluster to hopfully a more long
term solution.

* Adding missing KC_BSLS to ssedrick keymap for 4x5_5

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-13 20:38:31 +01:00
QMK Bot
6ae447a74f Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 19:11:13 +00:00
QMK Bot
e95ba0d651 Merge remote-tracking branch 'origin/master' into develop 2022-08-13 19:10:39 +00:00
mmccoyd
aee738c61b
[Keyboard] Add Hillside 46 (#17968) 
* 46: Copy from 52 and file rename

* 46: File internals refer to 46, not 52

* 46: Board remove row

* 46: Keymap: Lshift becomes ctrl, Rshift a symbol

- ESC and CAPs on upper thumbs
- AltGr and App on upper thumbs
- Page up/down on upper thumbs
- F11, F12 and mods for them on adjust

* 46: Readme update for json script, tweaks

* 46: Board fix LED count

* 46: Keymap: Arrows right, symmetric layer keys

* 46: Readme: Image link with and w/o outer pinkie

* 46: Keymap: link fixed image of nav layer

* 46: Keymap: fix reaching adj layer

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
 2022-08-13 20:10:01 +01:00
QMK Bot
4577c8f149 Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 18:03:02 +00:00
QMK Bot
826ab5412f Merge remote-tracking branch 'origin/master' into develop 2022-08-13 18:02:19 +00:00
alaviss
b1fe7621eb
RFC: add a simple implementation of the ploopy optical encoder (#17912) 2022-08-13 11:01:44 -07:00
QMK Bot
4406db168d Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 16:25:15 +00:00
QMK Bot
a03849c92c Merge remote-tracking branch 'origin/master' into develop 2022-08-13 16:24:37 +00:00