Skip to content

Commit

Permalink
Small formatting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
CRImier committed Jan 12, 2018
1 parent 37d4afc commit 90a4236
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
24 changes: 11 additions & 13 deletions CONTACT.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
# different way to contact us :
# Different ways to contact us:

## irc
The official channel is `#ZeroPhone` on `freenode`.
Mostly used for casual talk about ZeroPhone's development, debug and issues.
## IRC
The official channel is `#ZeroPhone` on `freenode`. It's mostly used for casual talk about ZeroPhone and ZPUI development, debugging and issues.
- [webchat](kiwiirc.com/client/irc.freenode.net/#ZeroPhone)
- [logs](mozzwald.com/irclog/zerophone/)

*If you don't get a response in time (because of timezones and other reasons people might not be online) and have to leave - please, leave your email address (or other form of communication) before leaving IRC,
so that we can get back to you (you can PM your contact details to **CRImier** on IRC).*
If you don't get a response in time (because of timezones and other reasons people might not be online) and have to leave - **please, leave your email address** (or other form of communication) before leaving IRC,
so that we can get back to you (you can PM your contact details to **CRImier** on IRC).

## github
Mostly for formal development tasks and bugs
- [ZPUI issues](github.com/ZeroPhone/ZPUI/issues) for issues related to the development of Apps and UI
- [Discussion and research](github.com/ZeroPhone/Discussion-and-Research/issues) for more generic discussion
## GitHub
We mostly us it for keeping tracks of formal development tasks and bugs
- [ZPUI issues](github.com/ZeroPhone/ZPUI/issues) - for ZPUI tasks and bugs
- [Discussion and research](github.com/ZeroPhone/Discussion-and-Research/issues) - for ZeroPhone tasks and bugs

## mail
For anything else you can mail the main developer :
`arsenijs at zerophone dot org`
## Email
If you prefer, you can email the main developer: `arsenijs at zerophone dot org`
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ We love pull requests! Here are some suggested steps to ensure that your improve
* If your changes concern the documentation, it'd be great if you could check that the documentation [still builds correctly and looks right](http://zpui.readthedocs.io/en/latest/docs_development.html#testing-your-changes-locally)
* Send in your PR, we'll review and comment on it as soon as possible!
* Take some time to explain what your PR is about, and how you implemented your feature, it'll help us review it faster

If your PR won't have any issues, we'll merge it right away. If we find some problems, we might fix them ourselves, but we'll likely ask you to fix them yourself in the meantime before we can get to them.

-----

**After your PR is reviewed, does'nt break anything and complies to our guidelines, it'll be merged!** Once your PR is merged, it'll likely go in the `devel` branch - unless it's a bugfix, in which case it'll go in all branches affected. If you need your changes in the master branch ASAP, let us know - we can speed up the merge.
**After your PR is reviewed, doesn't break anything and complies to our guidelines, it'll be merged!** Once your PR is merged, it'll likely go in the `devel` branch - unless it's a bugfix, in which case it'll go in all branches affected. If you need your changes in the master branch ASAP, let us know - we can speed up the merge.

#### Possible issues with your PR that you should watch out for:
* it's not documented enough. If you're adding features, they need to be documented. If you're changing an existing feature, keep the comments up-to-date. If you find some area lacking documentation that you want to see documented, let us know!
Expand Down

0 comments on commit 90a4236

Please sign in to comment.