diff --git a/.gitignore b/.gitignore index f9d61c51b4810f0edb6f131aed8c314569ba5601..37362859958746c65d98e3f0dd174f60b43e8876 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /node_modules/ /platforms/ios -#/platforms/android +/platforms/android /resources/android/build/local.properties /resources/android/build/*.keystore /resources/android/build/release-signing.properties diff --git a/dist/desktop b/dist/desktop index a6d5a936654cf307cfec4a4598ad2774e34f9f2f..4b5e3aef13e93c507fbf24c8aef832ada65f64ef 160000 --- a/dist/desktop +++ b/dist/desktop @@ -1 +1 @@ -Subproject commit a6d5a936654cf307cfec4a4598ad2774e34f9f2f +Subproject commit 4b5e3aef13e93c507fbf24c8aef832ada65f64ef diff --git a/resources/logo/web-ext/cesium-app-site.png b/resources/logo/web-ext/cesium-app-site.png new file mode 100644 index 0000000000000000000000000000000000000000..b932ffc924e1b7feec74b6f58d4e3f6ae04636c1 Binary files /dev/null and b/resources/logo/web-ext/cesium-app-site.png differ diff --git a/scripts/release.sh b/scripts/release.sh index 23ec02e86b090aa07259e2233a8f0de58a908650..ac25fa88ab8acd6116e0361ccb1ca9116bcfefcc 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -9,7 +9,7 @@ fi; cd ${PROJECT_DIR} -### Control that the script is run on `dev` branch +### Control that the script is run on `master` branch branch=$(git rev-parse --abbrev-ref HEAD) if [[ ! "$branch" == "master" ]]; then