Saman Bemel-Benrud 094f283f05 resolved conflict.

2013-03-21 19:25:29 -04:00

..

presets

Make name field less of a special case

2013-03-21 15:24:42 -07:00

core.yaml

resolved conflict.

2013-03-21 19:25:29 -04:00

data_dev.js

form/forms -> field/fields

2013-03-13 11:34:21 -07:00

deprecated.json

Fix errors in deprecated.json. Fixes #933

2013-03-08 15:23:33 -05:00

discarded.json

Build data into package

2013-03-06 16:16:12 -08:00

imagery_convert.js

Build data into package

2013-03-06 16:16:12 -08:00

imagery.json

Pull in updated imagery metadata from potlatch Fixes #681

2013-02-08 13:19:21 -05:00

imagery.xml

Pull in updated imagery metadata from potlatch Fixes #681

2013-02-08 13:19:21 -05:00

keys.json

Build data into package

2013-03-06 16:16:12 -08:00

locales.js

resolved conflict.

2013-03-21 19:25:29 -04:00

presets.yaml

Make name field less of a special case

2013-03-21 15:24:42 -07:00

update_locales.js

build.js now updates locales with local en changes

2013-03-19 15:31:13 -04:00