Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
author Maxious
()
committer Maxious
()
commit 4ef595011457a6451b0700b6b9e837a34eadcef6
tree 1fb8467f0e00f253beb26e15627fee19c344401a
parent db9339168ee1bf316c6c01c2449464efd79cb6fe
parent 084379d1559d8a6c7d65c80f8bdc2c0732c00676
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr

Conflicts:
.gitignore
.gitignore
.gitmodules
calls.json.php [ new file with mode 0644 ]
common.inc.php [ new file with mode 0644 ]
js/jquery-1.8.2.min.js [ new file with mode 0644 ]
nbproject/project.properties [ new file with mode 0644 ]
nbproject/project.xml [ new file with mode 0644 ]
viewcalls.php [ new file with mode 0644 ]