Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #11

Merged
merged 27 commits into from
May 4, 2012
Merged

Development #11

merged 27 commits into from
May 4, 2012

Conversation

decioferreira
Copy link
Contributor

No description provided.

th3james and others added 27 commits May 2, 2012 13:50
Conflicts:
	app/controllers/admin_controller.rb
	app/models/layer.rb
	app/views/admin/index.html.erb
decioferreira added a commit that referenced this pull request May 4, 2012
@decioferreira decioferreira merged commit 564609c into master May 4, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants