Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rowasc authored Aug 30, 2019
2 parents 2b2ade5 + 1235a24 commit 8b5ec78
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* [\[Client\] Setting up the Platform Client for development](getting-started/setup_alternatives/setting-up-the-platform-client.md)
* [Setting up the Pattern Library for development](getting-started/setup_alternatives/setting-up-the-pattern-library-for-development.md)
* [\[API & Client\] Bundled release install](getting-started/setup_alternatives/platform_release_install.md)
* [Design Process](getting-started/design-process.md)
* [🎨 Design Process](getting-started/design-process.md)
* [Development process](getting-started/development-process/README.md)
* [Issue tracking](getting-started/development-process/issue-tracking.md)
* [Coding Standards](getting-started/development-process/coding-standards.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/design-process.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Design Process
# 🎨 Design Process



Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Welcome to the hackathon!

We are so excited that you are here joining our hackathon!
❤️We are so excited that you are here joining our hackathon!

The hackathon runs between the 2nd of May to the 7th of May and you are welcome to participate whenever you can during that time. The chatter and support will happen on our gitter-channel: [https://gitter.im/ushahidi/installfest-2019](https://gitter.im/ushahidi/installfest-2019). We have tried to schedule our time so there will be someone online at least between 7am CET to 11 pm CET, sometimes longer than that. If you will participate outside these hours, don't worry, we will answer your questions as soon as we get online!

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: >-

## **Contributions**

Credits to Jessica Weber for adding a new description in the Ushahidi settings page, making it much more clear what the user is going to achieve by making a deployment private. <3
Credits to [Jessica Weber](https://github.com/jessicaweberdev) for adding a new description in the Ushahidi settings page, making it much more clear what the user is going to achieve by making a deployment private. <3

\*\*\*\*[**https://github.com/ushahidi/platform-client/pull/1320** ](https://github.com/ushahidi/platform/issues/2716) ****

Expand Down

0 comments on commit 8b5ec78

Please sign in to comment.