Skip to content
  • Artem Zakharov's avatar
    Merge branch 'development' into twitter · bde3bd1a
    Artem Zakharov authored
    # Conflicts:
    #	src/main/java/ua/softserve/academy/kv030/authservice/config/AppConfig.java
    #	src/main/java/ua/softserve/academy/kv030/authservice/services/ResourceServiceImpl.java
    #	src/main/resources/application.properties
    bde3bd1a