summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-29 18:44:51 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-29 18:44:51 +0100
commit731443c4120be0db84948906478db2df42da9d41 (patch)
treefa731414747a0dc664b8299aaeeb7f583821fba7 /app/assets
parenta9be92fdc62d55e6b6a8da80f0fe959ad90fa678 (diff)
parentbf3af8f8a444365f3040da2928837986409fa016 (diff)
Merge branch 'sso' into develop
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions