Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution ...

Merge Conflict Resolution

2015-03-05 19:49:15 -05:00

..

bench

Optimize iD.Connection

2013-02-10 12:31:59 -08:00

data

Remove d3.jsonp (only wiki.js used it)

2013-01-10 21:00:24 -08:00

lib

Manage rest of test libs with npm

2013-04-04 10:48:13 -07:00

spec

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

css

Rendering tagged points

2013-03-13 17:31:25 -07:00

img

Create a dist directory

2013-04-22 10:50:36 -07:00

index_packaged.html

Merge branch 'master' into conflict-resolution-ui

2015-02-06 19:08:50 -05:00

index.html

refactor Conflicts ui into its own component

2015-03-04 11:46:56 -05:00

rendering.html

selection -> selectedIDs

2013-06-03 15:48:03 -07:00