Christopher Allen 00676ed75a chore: Merge branch develop into no-checkin-built ...

Files that have had manual merge conflict resolution performed:

- gulpfile.js

Files where a merge conflic was resolved by deleting the file, because
it had previously been deleted in no-checkin-built:

- *_compresed.js*
- msg/js/*.js
- tests/run_all_tests.sh

Changes made (in no-checkin-built) to the following files that
have been deleted or obsoleted will need to be dealt with
manually; this will be done in a separate commit for clarity:

- tests/run_all_tests.sh
- tests/scripts/check_metadata.sh
- tests/scripts/run_generators.sh

2022-10-28 23:15:36 +01:00

..

goog_module

wording update

2021-07-29 15:24:45 -07:00

gulpfiles

chore: Merge branch develop into no-checkin-built

2022-10-28 23:15:36 +01:00

i18n

fix: Make message files work in unpackaged mode, and rebuild msg files

2022-08-08 14:29:50 -07:00

migration

chore: fix typo in renamings database (#6498)

2022-10-06 13:07:10 -07:00

package

fix: Rename Generator to CodeGenerator (#6585)

2022-10-28 01:59:00 +02:00

themes

Move theme scripts to scripts dir (#4041)

2020-07-14 11:44:25 -07:00

helpers.js

fix(build): build/test on windows (#6431)

2022-10-27 21:02:50 +01:00