From 510e0750fd87f4db522246cf60d8fc3f393bfaad Mon Sep 17 00:00:00 2001 From: Victoria Perez Mola <4315804+Victoriapm@users.noreply.github.com> Date: Fri, 30 Oct 2020 19:29:47 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d239dac9..ef0562cc 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,34 @@ -# Stakkato +# Murmur The friendly chat application. + +A free and open source desktop client for Harmony protocol. +
Join our project chat for announcements, support and contribution. + +## Building +Required dependecies: +- C++ +- QML + +Then run + + +## Usage + +## Docker-compose +See the [harmony-development/orchestration](https://github.com/harmony-development/orchestration) repo for more details on a docker-compose setup. + + +# How to contribute +This projects welcomes contributions and corrections. Before contributing, please make sure you have read the guidelines below. +If you decide to contribute anything, please do the following: + + +## General Instructions +Pull requests are the easiest and preferred method to contribute to any repo at Github. + +1. Fork this repository, or update if you've already forked it before. +2. Create a new branch specific to the issue you are working on with ``git checkout -b feature_name``. This action will separate the new feature from any other changes you may do and will make it easier to edit or ammend (read more [here](https://guides.github.com/introduction/flow/)). +3. Add your files on the new branch +4. Commit locally and push to the new branch with ``git push -u origin feature_name`` +5. Go to GIthub and make a pull request, please include all the information possible. From dd9855fdcf15809c917255785d9dfe998d6aa96c Mon Sep 17 00:00:00 2001 From: Victoria Perez Mola <4315804+Victoriapm@users.noreply.github.com> Date: Fri, 30 Oct 2020 22:47:14 +0100 Subject: [PATCH 2/5] Update README.md Co-authored-by: jan Pontaoski --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef0562cc..98d4a406 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ If you decide to contribute anything, please do the following: Pull requests are the easiest and preferred method to contribute to any repo at Github. 1. Fork this repository, or update if you've already forked it before. -2. Create a new branch specific to the issue you are working on with ``git checkout -b feature_name``. This action will separate the new feature from any other changes you may do and will make it easier to edit or ammend (read more [here](https://guides.github.com/introduction/flow/)). +2. Create a new branch specific to the issue you are working on with ``git checkout -b feature_name``. This action will separate the new feature from any other changes you may do and will make it easier to edit or amend (read more [here](https://guides.github.com/introduction/flow/)). 3. Add your files on the new branch 4. Commit locally and push to the new branch with ``git push -u origin feature_name`` 5. Go to GIthub and make a pull request, please include all the information possible. From 1cb4c06583cd718d587526b7b676187ede6e109b Mon Sep 17 00:00:00 2001 From: Victoria Perez Mola <4315804+Victoriapm@users.noreply.github.com> Date: Fri, 30 Oct 2020 22:47:23 +0100 Subject: [PATCH 3/5] Update README.md Co-authored-by: jan Pontaoski --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98d4a406..2350f9a4 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,4 @@ Pull requests are the easiest and preferred method to contribute to any repo at 2. Create a new branch specific to the issue you are working on with ``git checkout -b feature_name``. This action will separate the new feature from any other changes you may do and will make it easier to edit or amend (read more [here](https://guides.github.com/introduction/flow/)). 3. Add your files on the new branch 4. Commit locally and push to the new branch with ``git push -u origin feature_name`` -5. Go to GIthub and make a pull request, please include all the information possible. +5. Go to Github and make a pull request, please include all the information possible. From bcc625d4a8fddc5bb2e08d97246f45f03d5195fb Mon Sep 17 00:00:00 2001 From: Victoria Perez Mola <4315804+Victoriapm@users.noreply.github.com> Date: Fri, 30 Oct 2020 22:47:39 +0100 Subject: [PATCH 4/5] Update README.md Co-authored-by: jan Pontaoski --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 2350f9a4..b4c88e0e 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,6 @@ This projects welcomes contributions and corrections. Before contributing, pleas If you decide to contribute anything, please do the following: -## General Instructions -Pull requests are the easiest and preferred method to contribute to any repo at Github. - 1. Fork this repository, or update if you've already forked it before. 2. Create a new branch specific to the issue you are working on with ``git checkout -b feature_name``. This action will separate the new feature from any other changes you may do and will make it easier to edit or amend (read more [here](https://guides.github.com/introduction/flow/)). 3. Add your files on the new branch From 885c740358a6858529d281efd9845e2d2640072a Mon Sep 17 00:00:00 2001 From: Victoria Perez Mola <4315804+Victoriapm@users.noreply.github.com> Date: Sat, 31 Oct 2020 18:35:47 +0100 Subject: [PATCH 5/5] Update README.md --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index b4c88e0e..a96bac48 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,6 @@ Required dependecies: Then run -## Usage - -## Docker-compose -See the [harmony-development/orchestration](https://github.com/harmony-development/orchestration) repo for more details on a docker-compose setup. - - # How to contribute This projects welcomes contributions and corrections. Before contributing, please make sure you have read the guidelines below. If you decide to contribute anything, please do the following: