Skip to content

Commit

Permalink
Merge branch 'edge' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
AleksandarDev committed Jan 7, 2015
2 parents 0016598 + 3b666b3 commit be27a9e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![Stories in Ready](https://badge.waffle.io/Sparkiy/sparkiy-client.png?label=ready&title=Ready)](https://waffle.io/Sparkiy/sparkiy-client)
# Sparkiy
_[Sparkiy/sparkiy-client](https://github.com/Sparkiy/sparkiy-client)_

[![GratiPay Tips](https://img.shields.io/gratipay/sparkiy.svg?style=flat-square)](https://gratipay.com/sparkiy/)
[![Bountysource](https://www.bountysource.com/badge/team?team_id=54298&style=bounties_posted)](https://www.bountysource.com/teams/sparkiy-client/bounties?utm_source=sparkiy-client&utm_medium=shield&utm_campaign=bounties_posted)


## Overview
Bring your ideas to life. Make something everyone can play on their computer, tablet, phone and console.

Expand All @@ -17,6 +17,8 @@ Sparkiy is fully-featured platform for game and application development. Touch f

## Project status

[![Stories in Ready](https://badge.waffle.io/Sparkiy/sparkiy-client.png?label=ready&title=Tasks Ready)](https://waffle.io/Sparkiy/sparkiy-client)

| | master | beta | development | edge |
| ------------- | ------ | ---- | ----------- | ---- |
| Windows | [![master build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/master?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/master) | [![beta build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/beta?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/beta) | [![development build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/development?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/development) | [![edge build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/edge?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/edge) |
Expand Down

0 comments on commit be27a9e

Please sign in to comment.