| Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
|
|
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
|
|
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
polygon on main map!
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
chimere/admin.py
chimere/models.py
|