]> jfr.im git - solanum.git/commit
Merge branch 'master' of github.com:charybdis-ircd/charybdis into authd-framework-2
authorElizabeth Myers <redacted>
Sat, 19 Mar 2016 12:36:33 +0000 (07:36 -0500)
committerElizabeth Myers <redacted>
Sat, 19 Mar 2016 12:36:33 +0000 (07:36 -0500)
commit68f90ee2471a6c8729d299589f1e70dd01b4bc1f
tree3a9ee14fa0da8a2bcf513b2d8d8381a2bf7b3260
parenta16b484f275a1888d46061ccb507fa90a04cbd1b
parent43f06d8d8c46cf587e2c7af15941a6f9f10cbdd3
Merge branch 'master' of github.com:charybdis-ircd/charybdis into authd-framework-2