Merge branch 'develop' of https://github.com/akalongman/php-telegram-bot into fixes
- Conflicts:
- src/Entities/ServerResponse.php
Description
Description
Details
Details
- Provenance
Jack'lul Authored on Nov 25 2016, 12:28 PM - Parents
- R123:3d27fb5aff49: My bad...
R123:b1a89598bca5: resolve merge conflics - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- b1a89598bca5 resolve merge conflicsAuthorMBoretto
- 38a8658447d9 Clean up Entity tests.AuthorArmando Lüscher
- b1cc1f065470 Update docblock comments for Request methods.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- 1cfa47799860 Optimise tryMention a bit, removing duplicate code.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- d2205167dde0 Move tryMention to the Entity class.AuthorArmando Lüscher
- AuthorArmando Lüscher
- d4baa566172d Update getWebhookInfo entity to new structure.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- 3120727f2943 Improve docblock for object arrays.AuthorArmando Lüscher
- d58e54ba99b3 Fix survey command to use new Keyboard entities.AuthorArmando Lüscher
- f9a70a29ea09 Make use of the new Keyboard entities.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- c35a03fd8469 Merge pull request #3 from MBoretto/md_mentionAuthorArmando Lüscher
- c816458d1c7e improving try mention markdownAuthorMBoretto
- 94aa39ee842b introduce md tryMentionAuthorMBoretto
- 2711d62ab0ae First rewrite of the keyboard entities.AuthorArmando Lüscher
- bf5c06480932 Add initial rewrites of keyboard entities.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- da0a94d9399d Update entity tests.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- f6fb481d0d41 Initial ugly commit of the refactored Entities.AuthorArmando Lüscher