projects / osm / UI.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab1296b bd15293)
Merge branch 'v1.1' 42/1042/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Fri, 27 Jan 2017 19:26:04 +0000 (14:26 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Fri, 27 Jan 2017 19:26:51 +0000 (14:26 -0500)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge