projects / osm / N2VC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63413d0 a09dd50)
Merge branch 'master' into bug/fix-invalid-annotations
authorPete Vander Giessen <petevg@gmail.com>
Tue, 7 Mar 2017 21:20:39 +0000 (15:20 -0600)
committerGitHub <noreply@github.com>
Tue, 7 Mar 2017 21:20:39 +0000 (15:20 -0600)
1  2 
juju/client/connection.py patch | diff1 | diff2 | blob | history
juju/model.py patch | diff1 | diff2 | blob | history

diff --cc juju/client/connection.py
Simple merge
diff --cc juju/model.py
Simple merge