Merge remote-tracking branch 'origin/flags' into flags

Conflicts: public_html/script.js
2015-08-30 10:19:53 -06:00 · 2015-08-30 10:19:53 -06:00 · 9e00c2d0d3
commit 9e00c2d0d3
parent 402e40fc36 b5d49b451b
2 changed files with 4 additions and 3 deletions
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@ -113,7 +113,7 @@
                                        <span id="selected_follow" onclick="toggleFollowSelected();" class="pointer">&#x21D2</span>

                                        <a href="http://www.airframes.org/" onclick="document.getElementById('horrible_hack').submit.call(document.getElementById('airframes_post')); return false;">
-                                          <span id="selected_icao"></span>
+                                        <span id="selected_icao"></span>
                                        </a>
 					<span id="selected_flag"></span>
                                        <span id="selected_registration"></span>