Skip to content
Commit 9d45f6e6 authored by Augustus Kling's avatar Augustus Kling
Browse files

Merge branch '7.x-1.x' of git.drupal.org:project/ole into 7.x-1.x 

Conflicts:
	includes/openlayers_behavior_ole.js
parents 0eb3ee58 4116088a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment