Commit 19879817 authored by cazenave's avatar cazenave
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	target/classes/META-INF/build-info.properties
#	target/classes/git.properties
#	target/fdp-spring-boot.jar
#	target/fdp.jar
#	target/fdp.jar.original
#	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
parents 0942d92e 80e17bae
{
"groups": [],
"properties": [
{
"name": "instance.clientUrl",
"type": "java.lang.String",
"description": "Client URL."
},
{
"name": "instance.persistentUrl",
"type": "java.lang.String",
"description": "Persistent URL."
},
{
"name": "security.jwt.token.expiration",
"type": "java.lang.Long",
"description": "Number of days until a token expires."
},
{
"name": "security.jwt.token.secret-key",
"type": "java.lang.String",
"description": "Secret string used for JWT signing and validation (we recommend to generate some randomly)."
}
],
"hints": []
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment