Skip to content
Commit 30648a83 authored by Daniel Gultsch's avatar Daniel Gultsch
Browse files

Merge pull request #555 from SamWhited/build-fixes 

Fix problem when merging manifests during a Gradle build
parents 75392614 5c2a7936
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