Commit 204c1d2
committed
Merge branch 'patch-1' of https://github.com/rylan/angular-file-upload into rylan-patch-1
Conflicts:
angular-file-upload.js
angular-file-upload.min.js
angular-file-upload.min.map1 parent ac58540 commit 204c1d2
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1166 | 1166 | | |
1167 | 1167 | | |
1168 | 1168 | | |
1169 | | - | |
| 1169 | + | |
1170 | 1170 | | |
1171 | 1171 | | |
1172 | 1172 | | |
| |||
0 commit comments