12 commits

Author	SHA1	Message	Date
suyuan	9afdfcdf61	fix	2020-12-24 22:54:23 +08:00
suyuan	d4a61a414a	1	2020-12-24 22:51:25 +08:00
suyuan	3e62e515c8	Revert "Revert "Merge branch 'develop'"" ... This reverts commit 1b7bac2e0a.	2020-12-24 15:40:43 +08:00
suyuan	1b7bac2e0a	Revert "Merge branch 'develop'" ... This reverts commit bf16c8f251, reversing changes made to 15b5e54963.	2020-12-24 15:35:51 +08:00
suyuan	0ff958171e	Revert "Revert "Merge branch 'develop'"" ... This reverts commit f0937d0399.	2020-12-24 15:28:44 +08:00
suyuan	f0937d0399	Revert "Merge branch 'develop'" ... This reverts commit bf16c8f251, reversing changes made to 15b5e54963.	2020-12-24 15:26:48 +08:00
suyuan	68044e4831	Revert "Revert "Merge branch 'develop'"" ... This reverts commit 4144039007.	2020-12-24 15:26:38 +08:00
suyuan	4144039007	Revert "Merge branch 'develop'" ... This reverts commit bf16c8f251, reversing changes made to 15b5e54963.	2020-12-24 15:18:35 +08:00
suyuan	602cd0be8a	fixomr	2020-12-24 11:49:47 +08:00
suyuan	2fc16af55f	同步到最新的omr	2020-10-13 16:59:34 +08:00
suyuan	6083c17a63	修复CM520的op启动	2020-09-23 15:49:05 +08:00
Ycarus	9665df74ca	Remove eth1 set to wan, update dnsmasq init	2018-04-04 17:37:49 +02:00