Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix communications #723

Merged
merged 8 commits into from
Aug 27, 2016
Merged

Fix communications #723

merged 8 commits into from
Aug 27, 2016

Conversation

n8225
Copy link
Contributor

@n8225 n8225 commented Aug 27, 2016

Thank you for taking the time to work on a PR for Awesome-selfhosted!

To ensure your PR is dealt with swiftly please check the following:

  • Your submissions are formatted according to the guidelines.

    [Name](http://homepage/) - Short description. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code)) License Language``

  • Your additions are ordered alphabetically.

  • Your additions are free software, or if not they have been added to non-free.

  • Any licenses you have added are in our list of licenses.

  • You have searched the repository for any relevant issues or PRs.

  • Any category you are creating has the minimum requirement of 3 items.

Issues #35 #471

Fixes/updates to Communications.
I also moved Kontalk to XMPP Servers as it looks to be a fork of Tigase
and an android app for the client.  I didnt see a web client listed on
the site or in the repo.
@Kickball
Copy link
Collaborator

All the fixes look good, but there is a merge conflict.

@nodiscc nodiscc self-assigned this Aug 27, 2016
@n8225
Copy link
Contributor Author

n8225 commented Aug 27, 2016

merge conflict fixed

@Kickball Kickball merged commit b2102fe into awesome-selfhosted:master Aug 27, 2016
@nodiscc nodiscc removed their assignment Aug 27, 2016
nodiscc pushed a commit that referenced this pull request Sep 15, 2016
* Fix/Add missing license and language in Communications section

Fixes/updates to Communications.
I also moved Kontalk to XMPP Servers as it looks to be a fork of Tigase
and an android app for the client.  I didnt see a web client listed on
the site or in the repo.

* Fix Sendmail, add Sendmail to list of licenses

* added language kontalk

* alphabetize subs of Synapse

* Alphabetize some more

* more fixes

* fixes
@n8225 n8225 deleted the Fix-Communications branch October 24, 2016 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

3 participants