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

Add news #61

Merged
merged 10 commits into from
Apr 28, 2018
Merged

Add news #61

merged 10 commits into from
Apr 28, 2018

Conversation

maximzhemerenko
Copy link
Owner

No description provided.

omelchenkoaleks and others added 10 commits March 16, 2018 11:29
# Conflicts:
#	Android/app/src/main/java/com/khsm/app/presentation/ui/screens/rankings/FilterDialogFragment.java
#	Android/app/src/main/res/layout/filter_dialog_fragment.xml
# Conflicts:
#	Android/app/src/main/java/com/khsm/app/data/api/RestApi.java
#	Android/app/src/main/res/values-ru/strings_generated.xml
#	Android/app/src/main/res/values/strings_generated.xml
@maximzhemerenko maximzhemerenko merged commit dd4d547 into develop Apr 28, 2018
@maximzhemerenko maximzhemerenko deleted the add-news branch April 28, 2018 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants