Commit Graph

10 Commits

Author SHA1 Message Date
Your New SJW Waifu cf563451ae Revert "Merge branch 'revert-76fc9276' into 'neckbeard'"
This reverts merge request !2
2020-04-03 09:03:38 +00:00
Your New SJW Waifu 02160dbc03 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard"
This reverts commit 76fc927650
2020-04-02 00:57:27 +00:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Alexander Strizhakov 9f884a2639
tests changes 2020-03-07 11:01:37 +03:00
Alexander Strizhakov 931111fd55
removing integration tests 2020-03-05 18:57:45 +03:00
Mark Felder d9c5ae7c09 Update Copyrights for gun related files 2020-03-03 17:16:24 -06:00
Mark Felder 4427161ca3 Merge branch 'develop' into gun 2020-03-03 17:15:49 -06:00
Alexander Strizhakov 884d9710b2
refactoring for gun api modules 2020-03-03 19:24:14 +03:00
Alexander Strizhakov ad8f26c0a4
more info in Connections.checkin timout errors 2020-02-21 12:53:40 +03:00
Alexander Strizhakov 514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00