<hr>

<h4>You can merge this Pull Request by running:</h4>
<pre>  git pull https://github.com/jfirebaugh/openstreetmap-website 4587</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/106'>https://github.com/openstreetmap/openstreetmap-website/pull/106</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Support the same edit params for Potlatch 1 and 2</li>
  <li>Don't expose lat/lon of private traces</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li><strong>M</strong> app/controllers/site_controller.rb (15)</li>
  <li><strong>M</strong> app/views/site/_potlatch.html.erb (4)</li>
  <li><strong>M</strong> app/views/site/_potlatch2.html.erb (11)</li>
  <li><strong>M</strong> test/functional/site_controller_test.rb (37)</li>
</ul>

<h4>Patch Links</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/106.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/106.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/106.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/106.diff</a></li>
</ul>


            <p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">
              —<br>
              Reply to this email directly or <a href='https://github.com/openstreetmap/openstreetmap-website/pull/106'>view it on GitHub</a>.
            </p>
            <img src='https://github.com/notifications/beacon/J6T91GIPIyhU-8ti4GCGP98_UZTRAhtyIjAjorWDZ_nHQbMkn6bn63u74144AD7G.gif' height='1' width='1'>