summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorCallum Oakley <c.oakley108@gmail.com>2016-08-09 12:39:59 +0100
committerCallum Oakley <c.oakley108@gmail.com>2016-08-09 12:39:59 +0100
commit49fbcb3e7cea2d47df6350918ff6e00960a78b15 (patch)
tree468105b030bd61b3c12c1b93784ff38334113355 /util
parent725dd7328f9963959f72318af912ed66f5a5f513 (diff)
parentadad05c3fbd511e77a77484945fa2f675d6abf8b (diff)
downloadqmk_firmware-49fbcb3e7cea2d47df6350918ff6e00960a78b15.tar.gz
qmk_firmware-49fbcb3e7cea2d47df6350918ff6e00960a78b15.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util')
-rw-r--r--util/ergodox_ez.html1
-rw-r--r--util/travis_compiled_push.sh2
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