Steffen Jacobs 1d42faad79 Merge branch 'bug5049' into bug4892 ...

Conflicts:
	java/com.sap.sse.security/resources/shiro.ini
	java/com.sap.sse.security/src/com/sap/sse/security/jaxrs/api/RestApiApplication.java

2019-05-28 18:19:14 +02:00

..

.settings

…

META-INF

Bug 4963: Moved the logic to resolve a bearer token for a remote server

2019-04-03 09:01:21 +02:00

resources

Merge branch 'bug5049' into bug4892

2019-05-28 18:19:14 +02:00

src/com/sap/sse/security

Merge branch 'bug5049' into bug4892

2019-05-28 18:19:14 +02:00

WEB-INF

…

webservices/api

Merge branch 'bug5049' into bug4892

2019-05-28 18:19:14 +02:00

.classpath

…

.project

removed PluginNature from our OSGi bundles; they are not Eclipse plugins

2019-05-27 22:53:30 +02:00

build.properties

…

Login.html

…

pom.xml

…