diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-10-18 17:29:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-10-18 17:29:39 +0100 |
| commit | fa67791ff8e9f6e47288aca1a77dd4c539e8e01e (patch) | |
| tree | debcb2b06a53eb7738c288574906b72f7a4c06d6 | |
| parent | e40315974c6f036b6bebd86b3709cf3e409b41e8 (diff) | |
| parent | dec72b7b44d622406f9d769a67dfd1aeb8ec5432 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | bin/site-specific-install.sh | 1 | ||||
| -rw-r--r-- | phonegap/www/css/mobile.css | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 002413cfb..6ebac7970 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -19,7 +19,6 @@ misuse() { [ -z "$BRANCH" ] && misuse BRANCH [ -z "$SITE" ] && misuse SITE [ -z "$DEFAULT_SERVER" ] && misuse DEFAULT_SERVER -[ -z "$EC2_HOSTNAME" ] && misuse EC2_HOSTNAME [ -z "$HOST" ] && misuse HOST [ -z "$DISTRIBUTION" ] && misuse DISTRIBUTION [ -z "$VERSION" ] && misuse VERSION diff --git a/phonegap/www/css/mobile.css b/phonegap/www/css/mobile.css index f17f753fd..7fb375acd 100644 --- a/phonegap/www/css/mobile.css +++ b/phonegap/www/css/mobile.css @@ -26,7 +26,6 @@ } .mobile-info { - position: fixed; bottom: 0px; width: 100%; height: 20px; |