dependabot[bot]
6fdb997e8c
Bump anothrNick/github-tag-action from 1.63.0 to 1.64.0 ( #20911 )
...
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action ) from 1.63.0 to 1.64.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases )
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.63.0...1.64.0 )
---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-12 22:42:58 +01:00
James Young
a31eea61b7
WinKeys Mini Winni: rename LAYOUT_all to LAYOUT_ortho_2x4 ( #20881 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_ortho_2x4
* info.json: update maintainer field
Use the maintainer's GitHub username instead of their display name.
2023-05-12 15:33:41 +01:00
James Young
f8fb35d9fc
YMDK Wings Hotswap: rename LAYOUT_all to LAYOUT ( #20901 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT
* info.json: update listed maintainer
2023-05-12 15:33:16 +01:00
James Young
bd4c83427c
Wilba Tech WT75-A Layout Additions and Touch-Up ( #20877 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_ansi_blocker_split_bs
* add LAYOUT_ansi_blocker
* add LAYOUT_ansi_blocker_tsangan_split_bs
* add LAYOUT_ansi_blocker_tsangan
* readme.md: update metadata section
- convert to list
- update maintainer username
2023-05-12 01:20:38 -07:00
James Young
9149402c51
Wilba Tech WT65-XT: rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_tsangan ( #20873 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_tsangan
* readme.md: update maintainer username
2023-05-12 01:02:10 -07:00
James Young
38b908da02
Wilba Tech WT70-JB Layout Addition and Touch-Up ( #20876 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_nofrow_ansi_tsangan
* readme.md: update maintainer username
2023-05-12 00:41:52 -07:00
James Young
c8b6137e57
Wilba Tech WT69-A Layout Addition and Touch-Up ( #20875 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_xt_ansi_blocker_tsangan
* readme.md: update metadata section
- convert to list
- update maintainer username
2023-05-12 00:24:44 -07:00
James Young
a121ba0675
Wilba Tech WT65-XTX Layout Additions and Touch-Up ( #20874 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_split_bs
* add LAYOUT_65_xt_ansi_blocker
* add LAYOUT_65_xt_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_xt_ansi_blocker_tsangan
* readme.md: update maintainer username
2023-05-11 23:18:25 -07:00
James Young
46c81e052b
Wilba Tech WT65-G2 Layout Additions and Touch-Up ( #20872 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker_wkl_split_bs
* add LAYOUT_65_ansi_blocker_wkl
* add LAYOUT_65_iso_blocker_wkl_split_bs
* add LAYOUT_65_iso_blocker_wkl
* readme.md: update maintainer username
2023-05-11 21:37:44 -07:00
James Young
1ce77c649e
Wilba Tech WT65-G Layout Additions and Touch-Up ( #20871 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* enable Community Layout support
* readme.md: update maintainer username
2023-05-11 18:29:46 -07:00
James Young
a5720a9722
Wilba Tech WT65-FX Community Layout Support ( #20870 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* enable Community Layout support
* readme.md: update maintainer username
2023-05-11 18:15:54 -07:00
James Young
7a98f57bdd
Wilba Tech WT65-F Community Layout Support and Touch-Up ( #20869 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker
* enable Community Layout support
* readme.md: update maintainer username
2023-05-11 17:45:38 -07:00
James Young
fdcf2aefc5
Wilba Tech WT65-B Layout Addition and Touch-Up ( #20867 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_wkl_split_bs
* add LAYOUT_65_ansi_blocker_wkl
* readme.md: update metadata section
2023-05-11 13:51:07 -07:00
James Young
8165960031
Wilba Tech WT65-A Community Layout Support and Touch-Up ( #20866 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* enable Community Layout support
* readme.md: update maintainer username
2023-05-11 13:38:57 -07:00
James Young
22aad0c7bb
Wilba Tech WT60-XT Layout Additions and Touch-Up ( #20865 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_xt_ansi_split_bs_rshift
* add LAYOUT_60_xt_ansi
* add LAYOUT_60_xt_tsangan_hhkb
* add LAYOUT_60_xt_ansi_tsangan
* add LAYOUT_60_xt_ansi_wkl_split_bs_rshift
* add LAYOUT_60_xt_ansi_wkl
* add LAYOUT_60_xt_iso_split_bs_rshift
* add LAYOUT_60_xt_iso
* add LAYOUT_60_xt_iso_tsangan_split_bs_rshift
* add LAYOUT_60_xt_iso_tsangan
* add LAYOUT_60_xt_iso_wkl_split_bs_rshift
* add LAYOUT_60_xt_iso_wkl
* readme.md: update maintainer username
2023-05-11 13:19:08 -07:00
QMK Bot
c890d4010d
Merge remote-tracking branch 'origin/master' into develop
2023-05-11 20:05:17 +00:00
dependabot[bot]
f8d01e5eca
Bump anothrNick/github-tag-action from 1.62.0 to 1.63.0 ( #20868 )
...
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action ) from 1.62.0 to 1.63.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases )
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.62.0...1.63.0 )
---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-11 21:04:34 +01:00
James Young
ee5438a207
Wilba Tech WT60-H2: rename LAYOUT_all to LAYOUT_60_ansi_tsangan_split_rshift ( #20864 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_ansi_tsangan_split_rshift
* readme.md: update maintainer username
2023-05-11 12:47:30 -07:00
James Young
6ef513529b
Wilba Tech WT60-G2 Community Layout Support ( #20861 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_ansi_wkl_split_bs_rshift
* add LAYOUT_60_ansi_wkl
* add LAYOUT_60_hhkb
* enable Community Layout support
2023-05-11 12:03:29 -07:00
James Young
b467c1d504
Wilba Tech WT60-G Community Layout Support ( #20860 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_iso
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_hhkb
* enable Community Layout support
2023-05-11 11:13:40 -07:00
James Young
e2ad6ac809
Wilba Tech WT60-D Layout Addition and Touch-Up ( #20859 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* update readme.md
- update maintainer/hardware section to a list
- update listed maintainer (Wilba6582 -> Wilba)
2023-05-11 10:53:18 -07:00
James Young
8c5f075ed0
Wilba Tech WT60-C Community Layout Support ( #20858 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan_split_rshift
* add LAYOUT_60_hhkb
* enable Community Layout support
* readme.md: update maintainer
Wilba6582 -> Wilba
2023-05-11 10:37:32 -07:00
James Young
68c9862955
Wilba Tech WT60-BX Layout Additions and Touch-Up ( #20855 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan_split_rshift
* add LAYOUT_60_hhkb
* enable Community Layout support
* readme.md: update maintainer
Wilba6582 -> Wilba
2023-05-11 10:26:24 -07:00
James Young
663ffbcf40
Wilba Tech WT60-B Community Layout Support ( #20854 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_hhkb
* enable Community Layout support
2023-05-11 09:59:20 -07:00
James Young
43b58b26a3
Rama Works U80-A Community Layout Support ( #20853 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_tkl_ansi_tsangan
* enable Community Layout support
2023-05-11 09:32:54 -07:00
James Young
1448744ea9
Rama Works M65-BX Community Layout Support ( #20851 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* enable Community Layout support
2023-05-11 01:34:28 -07:00
James Young
8bc9c1ef6e
Rama Works M65-B Community Layout Support ( #20850 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs
* enable Community Layout support
2023-05-11 01:11:35 -07:00
James Young
4d9a87c212
Rama Works Koyu Community Layout Support ( #20848 )
...
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs
* enable Community Layout support
2023-05-11 00:43:52 -07:00
James Young
b7f9f73b2c
Prophet Layout Additions ( #20845 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_iso_wkl_split_bs_rshift
* add LAYOUT_60_iso_wkl
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_ansi_wkl_split_bs_rshift
* add LAYOUT_60_ansi_wkl
* enable Community Layout support
* info.json: remove extra line breaks
2023-05-11 00:03:49 -07:00
James Young
b684353abf
Cypher rev5 Layout Additions ( #20844 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting, phase 1
- use four-space indent
* info.json: apply friendly formatting, phase 2
- add key labels
* add LAYOUT_ansi_split_space_split_bs
* add LAYOUT_ansi_split_space
* add LAYOUT_ansi_6u_space_split_bs
* add LAYOUT_ansi_6u_space
* add LAYOUT_ansi_rwkl_split_bs
* add LAYOUT_ansi_rwkl
* add LAYOUT_ansi_wkl_split_bs
* add LAYOUT_ansi_wkl
* add LAYOUT_iso_split_space_split_bs
* add LAYOUT_iso_split_space
* add LAYOUT_iso_6u_space_split_bs
* add LAYOUT_iso_6u_space
* add LAYOUT_iso_rwkl_split_bs
* add LAYOUT_iso_rwkl
* add LAYOUT_iso_wkl_split_bs
* add LAYOUT_iso_wkl
2023-05-10 23:39:10 -07:00
James Young
01a77ec255
Weirdo Geminate60 Layout Additions ( #20843 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_iso
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* enable Community Layout support
2023-05-10 23:18:45 -07:00
Drashna Jaelre
aec882528a
[Bug] Fix compilation error introduced by #20669 ( #20849 )
2023-05-11 00:06:12 +01:00
James Young
81f66c177d
W1-AT Layout Additions ( #20842 )
...
* info.json: apply friendly formatting
* add matrix_diagram.md
* add LAYOUT_ansi_wkl_split_bs_rshift
* add LAYOUT_ansi_wkl
* add LAYOUT_iso_wkl_split_bs_rshift
* add LAYOUT_iso_wkl
2023-05-10 15:42:59 -07:00
Joel Challis
4ae45ca995
Tidy up encoder_map directions ( #20847 )
2023-05-10 22:55:49 +01:00
QMK Bot
853c8d4617
Format code according to conventions ( #20846 )
2023-05-10 22:36:15 +01:00
Drashna Jaelre
2ddad246ce
OLED Driver improvements ( #20331 )
...
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-05-10 14:04:53 -07:00
Pete Sevander
8a332e6f01
Fix Mod-Tap combo regression ( #20669 )
...
* Add keyevent for combo keyrecord
* Fix formatting
* Update quantum/process_keycode/process_combo.c
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Add combo unit-tests and hot-fix process_record_tap_hint
...as this function tries to lookup the combo keys passed in. This will
be refactored in a later pr.
---------
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2023-05-10 17:59:52 +02:00
James Young
6f2a1e4e17
Viktus SP_Mini Layout Additions ( #20835 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_4l2r_split_bs
* add LAYOUT_4l2r
* add LAYOUT_4l_split_bs
* add LAYOUT_4l
* add LAYOUT_2r_split_bs
* add LAYOUT_2r
2023-05-10 02:03:30 -07:00
James Young
dd50138d4a
Viktus SP111 Layout Additions ( #20834 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs_rshift
* add LAYOUT_ansi
* add LAYOUT_iso_split_bs_rshift
* add LAYOUT_iso
2023-05-10 01:33:26 -07:00
Drashna Jaelre
1385fdcffb
[Keyboard] Reduce compiled size for prototypist oceanographer's via keymap ( #20816 )
2023-05-10 08:58:36 +01:00
James Young
10a4b6c64f
Viktus Smolka Layout Additions ( #20833 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* info.json: fix layout overlap
* add LAYOUT_331_split_bs
* add LAYOUT_331
* add LAYOUT_ls11_split_bs
* add LAYOUT_ls11
* add LAYOUT_7u_space_split_bs
* add LAYOUT_7u_space
* add LAYOUT_313_split_bs
* add LAYOUT_313
* add LAYOUT_6u_space_split_bs
* add LAYOUT_6u_space
* info.json: clean up line breaks
2023-05-10 00:29:40 -07:00
James Young
06fa161811
Viendi 8L Layout Additions ( #20832 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs_rshift
* add LAYOUT_ansi
* add LAYOUT_ansi_arrow_split_bs
* add LAYOUT_ansi_arrow
* add LAYOUT_iso_split_bs_rshift
* add LAYOUT_iso
* add LAYOUT_iso_arrow_split_bs
* add LAYOUT_iso_arrow
* info.json: clean up line breaks
2023-05-09 23:59:21 -07:00
James Young
c36c6e7aef
TKC TKL A/B87 Layout Additions ( #20831 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* info.json: correct key positioning
* add LAYOUT_tkl_ansi_split_bs_rshift
* add LAYOUT_tkl_ansi
* add LAYOUT_tkl_iso_split_bs_rshift
* add LAYOUT_tkl_iso
* enable Community Layout support
2023-05-09 23:36:51 -07:00
James Young
678c1d9afe
TKC M0lly Layout Additions ( #20830 )
...
* add matrix_diagram.md
* refactor keymaps
- update grid alignment
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs_rshift
* add LAYOUT_ansi
* add LAYOUT_ansi_tsangan_split_bs_rshift
* add LAYOUT_ansi_tsangan
* add LAYOUT_iso_split_bs_rshift
* add LAYOUT_iso
* add LAYOUT_iso_tsangan_split_bs_rshift
* add LAYOUT_iso_tsangan
* info.json: remove extra line breaks
2023-05-09 23:14:08 -07:00
James Young
92114252c5
TKC California Layout Addition and Touch-Up ( #20829 )
...
* info.json: apply friendly formatting
* info.json: correct layout data
Update layout data to my best guess of the actual layout. Seems this product never went into production.
* rename LAYOUT_all to LAYOUT_ansi_split_bs_rshift
* add LAYOUT_ansi
* add matrix_diagram.md
* Apply suggestions from code review
2023-05-09 22:52:03 -07:00
James Young
02a5e1a53a
Switchplate Peripherals 910 Layout Additions ( #20827 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* enable Community Layout support
* Apply suggestions from code review
2023-05-09 22:30:49 -07:00
James Young
3c614d2dc8
Studio Kestra Nue Layout Additions ( #20825 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_iso
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_ansi_wkl_split_bs_rshift
* add LAYOUT_60_ansi_wkl
* add LAYOUT_60_iso_wkl_split_bs_rshift
* add LAYOUT_60_iso_wkl
* enable Community Layout support
* Apply suggestions from code review
2023-05-09 22:02:33 -07:00
James Young
7023940427
Stello65 Beta Layout Additions and Clean-Up ( #20824 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* remove encoder hack
Converts the rotary encoder hack to Encoder Map with QMK Configurator fallback.
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* enable Community Layout support
* Apply suggestions from code review
2023-05-09 21:30:35 -07:00
James Young
e3fbc4fdea
SmithRune Iron180 Layout Additions ( #20822 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_f13_ansi_split_bs_rshift
* add LAYOUT_tkl_f13_ansi
* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift
* add LAYOUT_tkl_f13_ansi_wkl
* add LAYOUT_tkl_f13_iso_split_bs_rshift
* add LAYOUT_tkl_f13_iso
* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_iso_tsangan
* add LAYOUT_tkl_f13_iso_wkl_split_bs_rshift
* add LAYOUT_tkl_f13_iso_wkl
* enable Community Layout support
* info.json: remove extra line breaks
2023-05-09 21:01:26 -07:00
James Young
de482b5e63
senselessclay had60 Layout Additions ( #20820 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_iso
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_ansi_wkl_split_bs_rshift
* add LAYOUT_60_iso_wkl_split_bs_rshift
* add LAYOUT_60_ansi_wkl
* add LAYOUT_60_iso_wkl
* enable Community Layout support
* info.json: remove extra line breaks
2023-05-09 20:28:25 -07:00