]> jfr.im git - irc/rizon/plexus4.git/commitdiff
projects / irc / rizon / plexus4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b9c8b8 f89e513)
Merge branch 'master' into routing
authorAdam <redacted>
Mon, 21 Aug 2017 21:19:13 +0000 (17:19 -0400)
committerAdam <redacted>
Mon, 21 Aug 2017 21:19:13 +0000 (17:19 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.