diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2013-08-05 21:54:06 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2013-08-05 21:54:06 +0400 |
| commit | 0932ee60516f3e8ce7d964de4cee79b96c4e344b (patch) | |
| tree | 89c16924ca4239d87c6efdfc8da9a08229f13134 /src/mirall/folderman.h | |
| parent | 26bd164168e7282fdf5da7aa2d7dd5620cbb01c9 (diff) | |
| parent | ee1b8465a3f08d39e8c71b9aa53401fde17c88ac (diff) | |
Merge branch 'shibboleth'
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
Diffstat (limited to 'src/mirall/folderman.h')
0 files changed, 0 insertions, 0 deletions