Diffusion php-telegram-bot dbeb0d842e45

Merge branch 'develop' into apiupdate
dbeb0d842e45
Actions

Project Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'develop' into apiupdate

Conflicts:
src/DB.php
structure.sql

Details

Provenance

Jack'lul

Authored on May 25 2016, 6:50 PM

Parents

R123:4854b66df8ea: fix creation order
R123:52e1ef1efa25: Merge pull request #189 from jacklul/dbchanges

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

52e1ef1efa25 Merge pull request #189 from jacklul/dbchanges
Author
Marco Boretto
Browse Repository
No Builds
No Audits
15afa620dbfa Merge pull request #3 from MBoretto/conflict
Author
Jack'lul
Browse Repository
No Builds
No Audits
307c4ceaac9f resolve botan conflict
Author
MBoretto
Browse Repository
No Builds
No Audits
8c66ba4ef9ec fix for getUpdates
Author
Jack'lul
Browse Repository
No Builds
No Audits
09d4337ebec9 Merge pull request #2 from MBoretto/520_fix
Author
Jack'lul
Browse Repository
No Builds
No Audits
0c11ef6cbbea mysql travis fix
Author
MBoretto
Browse Repository
No Builds
No Audits
bef7d9a14232 Merge pull request #1 from MBoretto/520_fix
Author
Jack'lul
Browse Repository
No Builds
No Audits
da9cf8487017 travis fix
Author
MBoretto
Browse Repository
No Builds
No Audits
56bfd1f9c77a switch to utf8mb4_unicode_520_ci collation
Author
Jack'lul
Browse Repository
No Builds
No Audits
0647dcbd7f9a set utf8mb4 as default and add possibility to set own encoding
Author
Jack'lul
Browse Repository
No Builds
No Audits
0c97f93789e2 rename chosen_inline_query to chosen_inline_result
Author
Jack'lul
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

src/

tests/

Unit/

ConversationTest.php

R123:dbeb0d842e45

.travis.yml

Loading...

src/DB.php

Loading...

src/Telegram.php

Loading...

structure.sql

Loading...

tests/Unit/ConversationTest.php

Loading...