Diffusion php-telegram-bot b1a89598bca5

resolve merge conflics
b1a89598bca5
Actions

Project Tags

None

Referenced Files

None

Subscribers

None

Description

resolve merge conflics

Details

Provenance

MBoretto

Authored on Nov 25 2016, 11:51 AM

Parents

R123:38a8658447d9: Clean up Entity tests.
R123:32ebf1af624b: Merge pull request #326 from monster3d/tests/telegram-bot-api

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

32ebf1af624b Merge pull request #326 from monster3d/tests/telegram-bot-api
Author
Marco Boretto
Browse Repository
No Builds
No Audits
36408fed3600 Edit a code for psr standard
Author
Monster3D
Browse Repository
No Builds
No Audits
8a92dcc1f784 Removes unused namespace from some unit tests
Author
Monster3D
Browse Repository
No Builds
No Audits
7abd96612489 Adds new Unit test for Entities/File
Author
Monster3D
Browse Repository
No Builds
No Audits
8747702a29aa Corrects code documentation
Author
Monster3D
Browse Repository
No Builds
No Audits
ef95789ab14d Adds new Unit test for Entities/Location
Author
Monster3D
Browse Repository
No Builds
No Audits
ba352838618e Adds new Unit test for Entities/WebHookInfo
Author
Monster3D
Browse Repository
No Builds
No Audits
c252c440382b Todo adds to a code
Author
Monster3D
Browse Repository
No Builds
No Audits
213d91c3c677 Todo adds to a code
Author
Monster3D
Browse Repository
No Builds
No Audits
8acc126fad8e Merge remote-tracking branch 'origin/develop' into tests/telegram-bot-api
Author
Monster3D
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

tests/

unit/

Entities/

LocationTest.php

WebhookInfoTest.php

R123:b1a89598bca5

tests/unit/Entities/FileTest.php

Loading...

tests/unit/Entities/LocationTest.php

Loading...

tests/unit/Entities/WebhookInfoTest.php

Loading...