diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-01-12 15:20:03 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-01-12 15:20:03 +0100 |
| commit | 99fe265a5fc077cb66c322e7f3d191ff7110aea0 (patch) | |
| tree | c9e04ccfcc5496d2300d7c26db5833e494b4cdad /client/src/vendor.ts | |
| parent | fcc5f77b95d330bfcb439c172b7fcc58f3162e4d (diff) | |
| parent | 91cc839af88730ba55f84997c56b85ea100070a7 (diff) | |
| download | PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.tar.gz PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.tar.zst PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.zip | |
Merge branch 'postgresql'
Diffstat (limited to 'client/src/vendor.ts')
| -rw-r--r-- | client/src/vendor.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/src/vendor.ts b/client/src/vendor.ts index 760fc8257..436c58f48 100644 --- a/client/src/vendor.ts +++ b/client/src/vendor.ts | |||
| @@ -29,7 +29,7 @@ import 'angular-pipes/src/math/bytes.pipe'; | |||
| 29 | import 'ng2-file-upload'; | 29 | import 'ng2-file-upload'; |
| 30 | import 'video.js'; | 30 | import 'video.js'; |
| 31 | import 'ng2-meta'; | 31 | import 'ng2-meta'; |
| 32 | import 'ng2-bootstrap/components/pagination'; | 32 | import 'ng2-bootstrap/pagination'; |
| 33 | import 'ng2-bootstrap/components/dropdown'; | 33 | import 'ng2-bootstrap/dropdown'; |
| 34 | import 'ng2-bootstrap/components/progressbar'; | 34 | import 'ng2-bootstrap/progressbar'; |
| 35 | import 'ng2-bootstrap/components/modal'; | 35 | import 'ng2-bootstrap/modal'; |