Merge remote-tracking branch 'origin/0.12' into devel-0.13
[astakos] / snf-astakos-app / conf /
drwxr-xr-x   ..
-rw-r--r-- 284 20-snf-astakos-app-cloudbar.conf
-rw-r--r-- 4943 20-snf-astakos-app-settings.conf
-rw-r--r-- 3004 terms-sample.html