Merge branch 'master' into ci3

This commit is contained in:
Claude 2015-09-01 17:19:30 +02:00
commit 1e2aa24a79

View File

@ -35,3 +35,4 @@
* Franklyn Tackitt https://github.com/kageurufu (Fixed bug with db_prefix config value) * Franklyn Tackitt https://github.com/kageurufu (Fixed bug with db_prefix config value)
* Aleksandar Puharic https://github.com/xZero707/ (New URL shortening API-s Goo.gl and Bit.ly, several fixes) * Aleksandar Puharic https://github.com/xZero707/ (New URL shortening API-s Goo.gl and Bit.ly, several fixes)
* Benjamin Townsend https://github.com/benjaminarthurt (submitted pull request to casimir/gw.gd which fixes a bug) * Benjamin Townsend https://github.com/benjaminarthurt (submitted pull request to casimir/gw.gd which fixes a bug)
* Pawel Janisio https://github.com/PJanisio (Several fixes; QR code, hardcoded paths etc., geshi update)