Skip to content

Commit 61a2b0c

Browse files
author
Elad Zelingher
committed
Merge branch 'develop' into reconnect
2 parents 8d59bf3 + f5b62df commit 61a2b0c

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ script:
1414

1515
branches:
1616
only:
17-
- develop
17+
- wampv2

README.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
WampSharp
22
=========
3-
3+
[![NuGet Version][NuGetImgMaster]][NuGetLinkMaster]
44

55
A C# implementation of [WAMP (The Web Application Messaging Protocol)][WampLink]
66

@@ -13,8 +13,13 @@ The implementation also supports WAMPv1, both client and server roles.
1313
Master | Provider
1414
------ | --------
1515
[![Build Status][WinImgMaster]][WinLinkMaster] | Windows CI Provided By [CodeBetter][] and [JetBrains][]
16+
[![Build Status][AppVeyorImgMaster]][AppVeyorLinkMaster] | Windows CI Provided By [AppVeyor][]
1617
[![Build Status][MonoImgMaster]][MonoLinkMaster] | Mono CI Provided by [travis-ci][]
1718

19+
## WampSharp v1.2.1.6-beta
20+
21+
WampSharp v1.2.1.6-beta released, see version [release notes](https://github.com/Code-Sharp/WampSharp/wiki/WampSharp-v1.2.1.6-beta-release-notes).
22+
1823
## Get Started
1924

2025
See [Get started tutorial](https://github.com/Code-Sharp/WampSharp/wiki/Getting-started-with-WAMPv2) and
@@ -32,12 +37,22 @@ WAMPv1 support is still available. You can read about it at the [Wiki](https://g
3237

3338
If you're updating from a previous WampSharp version and you're not interested yet in updating your application to WAMPv2, please read the following [notes](https://github.com/Code-Sharp/WampSharp/wiki/Notes-for-WAMPv1-users).
3439

40+
## Donations
41+
42+
If you found WampSharp helpful and want to donate, you are welcome to do so via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UHRAS9KZPNPX4).
43+
44+
Your donations help keep this project development alive.
45+
3546
[WampLink]:http://wamp.ws
3647

37-
[WinImgMaster]:http://teamcity.codebetter.com/app/rest/builds/buildType:\(id:WampSharp_Dev_Build\)/statusIcon
38-
[WinLinkMaster]:http://teamcity.codebetter.com/project.html?projectId=WampSharp_Dev&guest=1
39-
[MonoImgMaster]:https://travis-ci.org/Code-Sharp/WampSharp.png?branch=develop
48+
[NuGetImgMaster]:http://img.shields.io/nuget/v/WampSharp.Default.svg
49+
[NuGetLinkMaster]:http://www.nuget.org/packages/WampSharp.Default/
50+
[WinImgMaster]:https://img.shields.io/teamcity/codebetter/WampSharp_Wampv2_Build.svg
51+
[WinLinkMaster]:http://teamcity.codebetter.com/project.html?projectId=WampSharp_Wampv2&guest=1
52+
[MonoImgMaster]:https://img.shields.io/travis/Code-Sharp/WampSharp/wampv2.svg
4053
[MonoLinkMaster]:https://travis-ci.org/Code-Sharp/WampSharp
54+
[AppVeyorLinkMaster]:https://ci.appveyor.com/project/darkl/wampsharp-759
55+
[AppVeyorImgMaster]:https://ci.appveyor.com/api/projects/status/fgbqbgwqx4j8jain
4156

4257
[JetBrains]:http://www.jetbrains.com/
4358
[CodeBetter]:http://codebetter.com/

releasenotes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WampSharp v1.2.1.0-beta release notes
1+
WampSharp v1.2.1.6-beta release notes
22
=================================
33

44
**Contents**

0 commit comments

Comments
 (0)