Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into add_nsPredi…
Browse files Browse the repository at this point in the history 
…cate_strategy

# Conflicts:
#	src/main/java/ru/colibri/ui/settings/ios/IOSByFactory.java
  • Loading branch information
@JasperJhons
JasperJhons committed Aug 28, 2017
2 parents bb531d0 + 7b4355f commit 9af975b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9af975b

Please sign in to comment.