diff options
| author | Joshua T <joshua@sonofone.net> | 2016-08-07 23:28:59 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-08-07 23:28:59 -0500 |
| commit | 6df31120a1904ee1330787701d4bcb84c4c72390 (patch) | |
| tree | b0fb3ccd691c17240442271f12c5af2ba9843295 /util | |
| parent | cf795a6f93a541c2ff5d64daa0aefd1f97d62035 (diff) | |
| parent | 213cb2c24306e198e717fc162806201567666f36 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util')
| -rw-r--r-- | util/ergodox_ez.html | 1 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/util/ergodox_ez.html b/util/ergodox_ez.html new file mode 100644 index 0000000000..8e92866070 --- /dev/null +++ b/util/ergodox_ez.html @@ -0,0 +1 @@ +<html><head><meta http-equiv="refresh" content="0; url=http://qmk.fm/keyboards/ergodox/" /></head></html>
\ No newline at end of file diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 01317f4be2..27ab3cec66 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -15,6 +15,8 @@ git submodule update --init --recursive rm -rf keyboard rm -rf keyboards cp -r ../qmk_firmware/keyboards . +mkdir keyboards/ergodox_ez/ +cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html cp ../qmk_firmware/readme.md qmk_readme.md ./generate.sh |