Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
author Alex Sadleir
()
committer Alex Sadleir
()
commit e2a40f793bb5cc73cc423d9abd00fa43566174c7
tree b0affb12e55724c2518ced4d26af1beb9fc93a24
parent 7f656084c6c96fca04e8576ae1f88afcee20a5d0
parent cb7ea21cd1ad2c3d82bac661c439bab277d1d0d7
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr

Conflicts:
.idea/workspace.xml
generateHourlys.php
18 files changed:
.idea/sqldialects.xml [ new file with mode 0644 ]
.idea/vcs.xml
.idea/workspace.xml [ deleted file ]
README.md [ deleted file ]
README.txt [ deleted file ]
common.inc.php
cron.php [ deleted file ]
css/daterangepicker.css [ new file with mode 0644 ]
datepicker.php [ new file with mode 0755 ]
db.sql
generateConvos.php [ deleted file ]
generateHourlys.php
js/daterangepicker.js [ new file with mode 0644 ]
js/script.js~ [ new file with mode 0644 ]
js/sugar.min.js [ new file with mode 0644 ]
purgeArchived.php [ new file with mode 0644 ]
run.bat [ deleted file ]
viewcalls.php