diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-08-26 17:03:31 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-08-26 17:03:31 +0200 |
| commit | d33ca1e2178d4e18fcf57140e1ff7a1914dcfb08 (patch) | |
| tree | aef0cffc29351d97c24fa12f4e2d79319f776943 /l10n/.gitkeep | |
| parent | c94b02a1150745fe9d62fcf351caa125fb4a1204 (diff) | |
| parent | 3bd3555eb315785e4078e3818dfb856022586223 (diff) | |
move apps
Merge branch 'master' of ../core
Conflicts:
files_odfviewer/js/viewer.js
Diffstat (limited to 'l10n/.gitkeep')
0 files changed, 0 insertions, 0 deletions