diff options
author | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
---|---|---|
committer | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
commit | edd92e4c09151238a89816186914f9382293ab9b (patch) | |
tree | e25d87cecf45ff2c2189198e5369f7754e01873a /l10n/pl_PL | |
parent | 1348330c7d75d2b60d845a43be57dedc6199ea1a (diff) | |
parent | 12f4494de02457d51004ca6a82c1b2160189819f (diff) | |
download | nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.tar.gz nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.zip |
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'l10n/pl_PL')
0 files changed, 0 insertions, 0 deletions