Merge branch 'development' of https://github.com/GuardianFree/ng2-file-upload into development

Browse Source

# Conflicts:
#	components/file-upload/file-uploader.class.ts

...

This commit is contained in:

GuardianFree

2016-10-12 10:33:42 +03:00

parent ed2e8b5659 e8dcd137d0

commit b207ec5843

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available