Merge pull request #3 from MBoretto/conflict
Conflict
Description
Description
Details
Details
- Provenance
Jack'lul Authored on May 24 2016, 9:45 AM - Parents
- R123:307c4ceaac9f: resolve botan conflict
R123:09d4337ebec9: Merge pull request #2 from MBoretto/520_fix - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- 307c4ceaac9f resolve botan conflictAuthorMBoretto
- 8c66ba4ef9ec fix for getUpdatesAuthorJack'lul
- abd1c22756b6 botan.io integration instructionsAuthorJack'lul
- 308d451f8287 curl handler always closed correctlyAuthorMBoretto
- b2ad7c67a601 make sure the message begins with a commandAuthorJack'lul
- AuthorJack'lul
- 771a5061caff introduce botan.io integrationAuthorJack'lul
- c87ae13e1970 remove these comments (Entity.php handles this)AuthorJack'lul
- AuthorJack'lul
- 72ffc486f410 adjust for new Entity.phpAuthorJack'lul
- 4ed4395c92d9 fix mistakesAuthorJack'lul
- 7147b12f0e5e adding example for Inline keyboardAuthorMBoretto
- 2bdd0d12f783 Update CREDITSAuthorJack'lul
- 00f719a4b6c2 update isAdmin()AuthorJack'lul
- 61d6c755c52a Merge pull request #190 from jacklul/fixAuthorJack'lul
- 871e8f54df32 quick fixAuthorJack'lul
- ebfd9b066968 Merge pull request #188 from jacklul/miscfixesAuthorArmando Lüscher
- AuthorJack'lul
- 1e86fb7004ac add missing bots 2.0 entitiesAuthorJack'lul