summaryrefslogtreecommitdiff
path: root/pcr/jitsi
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-07-06 22:04:31 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-07-06 22:04:31 -0600
commit2967b22c6179ded9cc01496e10dcb0f292d0c182 (patch)
tree9219e7dc564f3dc8af29ea142c4b5d409ea74310 /pcr/jitsi
parent55677d14e4829d6a7859333d3560db346c228fdf (diff)
parente84010fb9a6f81d96d9c54661a7abde97a0eb187 (diff)
Merge branch 'master-remote' into master-undelete
Diffstat (limited to 'pcr/jitsi')
0 files changed, 0 insertions, 0 deletions