diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-29 18:44:51 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-29 18:44:51 +0100 |
| commit | 731443c4120be0db84948906478db2df42da9d41 (patch) | |
| tree | fa731414747a0dc664b8299aaeeb7f583821fba7 /app/assets | |
| parent | a9be92fdc62d55e6b6a8da80f0fe959ad90fa678 (diff) | |
| parent | bf3af8f8a444365f3040da2928837986409fa016 (diff) | |
Merge branch 'sso' into develop
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions