screen_demo2.git

Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-05 42ac7e8242e0e6fa51816449f4d73f5e80114b9a

refs
author	fengxiang <110431245@qq.com>
	Monday, March 5, 2018 10:08 +0800
committer	fengxiang <110431245@qq.com>
	Monday, March 5, 2018 10:08 +0800
commit	42ac7e8242e0e6fa51816449f4d73f5e80114b9a
tree	263b6396f9196bcff7e702cb4c77e055ee6ca39b tree \| zip \| gz
parent	6a6f068632e9218b72534e392e69aa056ebcd06a view \| diff be303f4e6ebb0e679c44aaed628476401fc905d0 view \| diff

Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

28 files deleted

3 files added

2 files modified

	src/app/layout/default/header/header.component.html	4 ●●●●● diff \| view \| raw \| blame \| history
	src/app/layout/passport/passport.component.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/.gitkeep	diff \| view \| raw \| blame \| history
	src/assets/demo.docx	diff \| view \| raw \| blame \| history
	src/assets/demo.pdf	diff \| view \| raw \| blame \| history
	src/assets/demo.pptx	diff \| view \| raw \| blame \| history
	src/assets/demo.xlsx	diff \| view \| raw \| blame \| history
	src/assets/iconsfont.json	2310 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/img/1.png	diff \| view \| raw \| blame \| history
	src/assets/img/2.png	diff \| view \| raw \| blame \| history
	src/assets/img/3.png	diff \| view \| raw \| blame \| history
	src/assets/img/4.png	diff \| view \| raw \| blame \| history
	src/assets/img/5.png	diff \| view \| raw \| blame \| history
	src/assets/img/6.png	diff \| view \| raw \| blame \| history
	src/assets/img/avatar.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg1.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg10.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg2.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg3.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg4.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg5.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg6.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg7.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg8.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/bg9.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/half-float-bg-1.jpg	diff \| view \| raw \| blame \| history
	src/assets/img/logo-color.svg	25 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/img/logo-full.svg	47 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/img/logo.svg	25 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/img/logo_100x40.png	diff \| view \| raw \| blame \| history
	src/assets/img/logo_30x30.png	diff \| view \| raw \| blame \| history
	src/assets/img/logo_44x44.png	diff \| view \| raw \| blame \| history
	src/assets/pois.json	59 ●●●●● diff \| view \| raw \| blame \| history