Vincent Breitmoser 30207ee11f Merge commit '0b7fb70' ...

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml

2014-04-22 11:30:14 +02:00

..

src

Merge commit '0b7fb70'

2014-04-22 11:30:14 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Update maven libs and use fixed version

2014-04-18 20:54:13 +02:00