Skip to content

Commit 1533910

Browse files
authored
Merge branch 'master' into dev
2 parents 3eab76e + e0ceb54 commit 1533910

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## v2.2.15
4+
5+
* remove xargs from start.sh [634da81](https://github.com/builder555/PineSAM/commit/634da81f239c08027cc799d264526d0f95ce9fa0)
6+
* Merge pull request #228 from dotzenith/remove-xargs
7+
8+
fix: remove xargs from start.sh [303496d](https://github.com/builder555/PineSAM/commit/303496d9e42ac0f2d9ae7c84eb51a6e20817fb60)
9+
* fix: dummy commit to trigger a build [f007f1b](https://github.com/builder555/PineSAM/commit/f007f1bef8f68efecda68b7573c09dc9bc91732a)
10+
11+
## v2.2.14
12+
13+
* Merge pull request #226 from builder555/master
14+
15+
update dev [3989424](https://github.com/builder555/PineSAM/commit/398942435f3dc439f80129b09d0d472b91e9abcb)
16+
* fix: another action trigger [5aafa5a](https://github.com/builder555/PineSAM/commit/5aafa5aa96e129959bc6c4c61ff6867b7ea8d7d6)
17+
318
## v2.2.12
419

520
* Use legacy websockets asyncio implementation [7e72d1a](https://github.com/builder555/PineSAM/commit/7e72d1a3859ddaa5b6b1f93bd355f84bb3c3c899)

Readme.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,13 @@ pipenv run test
225225
</td>
226226
</tr>
227227
<tr>
228+
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
229+
<a href=https://github.com/dotzenith>
230+
<img src=https://avatars.githubusercontent.com/u/77712443?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=zenith/>
231+
<br />
232+
<sub style="font-size:14px"><b>zenith</b></sub>
233+
</a>
234+
</td>
228235
<td align="center" style="word-wrap: break-word; width: 150.0; height: 150.0">
229236
<a href=https://github.com/krisstakos>
230237
<img src=https://avatars.githubusercontent.com/u/5090779?v=4 width="100;" style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=Kristian Kosev/>

0 commit comments

Comments
 (0)