projects / trust_router.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec6ee7b 2ac25eb)
Merge branch 'master' into debian
authorJennifer Richards <jennifer@painless-security.com>
Thu, 12 Jan 2017 21:53:15 +0000 (16:53 -0500)
committerJennifer Richards <jennifer@painless-security.com>
Thu, 12 Jan 2017 21:53:15 +0000 (16:53 -0500)
1  2 
trust_router.spec patch | diff1 | diff2 | blob | history

diff --cc trust_router.spec
Simple merge
Moonshot Trust Router