tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged develop into max/backend

Browse Source
This commit is contained in:
Maximilian Leopold 2019-04-06 16:16:13 +02:00
parent 11d2b6165c
commit f28418a8ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -35,15 +35,15 @@ dependencies {
//JSON Parser
implementation 'com.google.code.gson:gson:2.8.5'
<<<<<<< HEAD
compile 'org.springframework.boot:spring-boot-starter-tomcat'
compile 'org.springframework.boot:spring-boot-starter-security'
compile 'org.springframework.boot:spring-boot-starter-actuator'
compile 'org.springframework.boot:spring-boot-starter-aop'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '1.2.0.RELEASE'
=======
compile group: 'org.springframework.security', name: 'spring-security-core', version: '5.1.4.RELEASE'
>>>>>>> develop
//JWT
compile 'io.jsonwebtoken:jjwt-api:0.10.5'