src/timepicker/timepicker.component.ts · 56c0bc9b80a7e0a253d3cddfe4736e51617e59fe · Andrey Shilov / Ngx Bootstrap

Merge branch 'feat-timepicker-config' of... · 48977d65

Dmitriy Shekhovtsov authored Dec 02, 2016

Merge branch 'feat-timepicker-config' of https://github.com/macroorganizm/ng2-bootstrap into macroorganizm-feat-timepicker-config

Conflicts:
	components/timepicker.ts
	src/timepicker/timepicker.component.ts

48977d65

timepicker.component.ts 10.9 KB

Replace timepicker.component.ts