Merge branch 'DAO'
[proteocache.git] / conf /
drwxr-xr-x   ..
-rw-r--r-- 983 GA.properties
-rw-r--r-- 1226 Proteocache.properties