1. 17 Aug, 2019 4 commits
  2. 16 Aug, 2019 1 commit
  3. 14 Aug, 2019 1 commit
  4. 06 Aug, 2019 2 commits
  5. 03 Aug, 2019 4 commits
  6. 31 Jul, 2019 3 commits
  7. 30 Jul, 2019 1 commit
  8. 29 Jul, 2019 1 commit
  9. 28 Jul, 2019 1 commit
  10. 27 Jul, 2019 2 commits
  11. 26 Jul, 2019 5 commits
  12. 25 Jul, 2019 1 commit
  13. 24 Jul, 2019 1 commit
  14. 23 Jul, 2019 2 commits
  15. 22 Jul, 2019 2 commits
  16. 21 Jul, 2019 7 commits
  17. 20 Jul, 2019 1 commit
  18. 17 Jul, 2019 1 commit
    • Ozzieisaacs's avatar
      Merge branch 'Develop' · 26a7d9ef
      Ozzieisaacs authored
      # Conflicts:
      #	cps/__init__.py
      #	cps/about.py
      #	cps/admin.py
      #	cps/cli.py
      #	cps/config_sql.py
      #	cps/constants.py
      #	cps/converter.py
      #	cps/db.py
      #	cps/editbooks.py
      #	cps/gdriveutils.py
      #	cps/helper.py
      #	cps/logger.py
      #	cps/oauth.py
      #	cps/server.py
      #	cps/services/simpleldap.py
      #	cps/ub.py
      #	cps/web.py
      #	cps/worker.py
      #	optional-requirements.txt
      #	setup.cfg
      #	setup.py
      26a7d9ef