Merge remote-tracking branch 'upstream/master' into 4.0

13 years ago · e6014d531d
parent c130db2c9e a3456a397f
commit e6014d531d
1 changed files with 1 additions and 0 deletions
--- a/astrid/proguard.cfg
+++ b/astrid/proguard.cfg
@ -11,6 +11,7 @@
 -keep, allowshrinking, allowoptimization class com.todoroo.**
 -keep class com.mdimension.**
 -keep class com.google.common.base.Preconditions
+-keep class * extends com.todoroo.andlib.data.AbstractModel

 # ignore reflection-based access from google libraries
 -dontwarn com.google.**