Merge branch 'master' into losrios

2018-07-17 11:37:36 +02:00 · 2018-07-17 11:37:36 +02:00 · 6d508f0eb9
commit 6d508f0eb9
parent 1beaa5673d 67ec2918a3
36 changed files with 47 additions and 3 deletions
--- a/domains/cn/edu/nuit.txt
+++ b/domains/cn/edu/nuit.txt
@ -0,0 +1,2 @@
+Neusoft Institute Guangdong
+广东东软学院
--- a/lib/domains/cn/edu/cjlu.txt
+++ b/lib/domains/cn/edu/cjlu.txt
@ -0,0 +1,2 @@
+China Jiliang University
+中国计量大学
--- a/lib/domains/cn/edu/cjlu/stu.txt
+++ b/lib/domains/cn/edu/cjlu/stu.txt
@ -0,0 +1,2 @@
+China Jiliang University
+中国计量大学(学生邮箱)
--- a/lib/domains/cn/edu/cqut/2014.txt
+++ b/lib/domains/cn/edu/cqut/2014.txt
@ -0,0 +1 @@
+Chongqing University of Technology
--- a/lib/domains/cn/edu/ntu.txt
+++ b/lib/domains/cn/edu/ntu.txt
@ -0,0 +1 @@
+nantong university
--- a/lib/domains/cn/edu/ntu/stu.txt
+++ b/lib/domains/cn/edu/ntu/stu.txt
@ -0,0 +1 @@
+nantong university
--- a/lib/domains/cn/edu/shou/stu.txt
+++ b/lib/domains/cn/edu/shou/stu.txt
@ -0,0 +1 @@
+Shanghai Ocean University;
--- a/lib/domains/cn/edu/sysu.txt
+++ b/lib/domains/cn/edu/sysu.txt
@ -0,0 +1 @@
+Sun Yat-Sen University
--- a/lib/domains/cn/edu/xupt/stu.txt
+++ b/lib/domains/cn/edu/xupt/stu.txt
@ -0,0 +1 @@
+Xi’an University of Posts and Telecommunications
--- a/lib/domains/cn/edu/xust.txt
+++ b/lib/domains/cn/edu/xust.txt
@ -0,0 +1 @@
+Xi'an University of Science and Technology
--- a/lib/domains/cn/edu/zsc.txt
+++ b/lib/domains/cn/edu/zsc.txt
@ -0,0 +1 @@
+University of Electronic Science and Technology of China，Zhongshan Institute
--- a/lib/domains/com/bj35.txt
+++ b/lib/domains/com/bj35.txt
@ -0,0 +1 @@
+No.35 high school of Beijing
--- a/lib/domains/edu/ccsf.txt
+++ b/lib/domains/edu/ccsf.txt
@ -0,0 +1 @@
+City College of San Francisco
--- a/lib/domains/edu/dgu.txt
+++ b/lib/domains/edu/dgu.txt
@ -0,0 +1 @@
+Dongguk University
--- a/lib/domains/edu/dongguk.txt
+++ b/lib/domains/edu/dongguk.txt
@ -0,0 +1 @@
+Dongguk University
--- a/lib/domains/edu/handong.txt
+++ b/lib/domains/edu/handong.txt
@ -0,0 +1 @@
+Handong Global University
--- a/lib/domains/edu/hm.txt
+++ b/lib/domains/edu/hm.txt
@ -0,0 +1,2 @@
+Hochschule Munchen
+University of applied science Munich
--- a/lib/domains/edu/itu.txt
+++ b/lib/domains/edu/itu.txt
@ -0,0 +1 @@
+International Technology Institute
--- a/lib/domains/edu/losrios.txt
+++ b/lib/domains/edu/losrios.txt
@ -1 +1,8 @@
 Los Rios Community College District
+=======
+American River College
+Cosumnes River College
+Folsom Lake College
+Sacramento City College
+.group
+
--- a/lib/domains/edu/mssu.txt
+++ b/lib/domains/edu/mssu.txt
@ -0,0 +1 @@
+Missouri Southern State University
--- a/lib/domains/edu/nitt.txt
+++ b/lib/domains/edu/nitt.txt
@ -0,0 +1 @@
+National Institute of Technology, Tiruchirappalli
--- a/lib/domains/edu/ohlone/student.txt
+++ b/lib/domains/edu/ohlone/student.txt
@ -0,0 +1 @@
+Ohlone College
--- a/lib/domains/edu/saeinstitute.txt
+++ b/lib/domains/edu/saeinstitute.txt
@ -0,0 +1 @@
+SAE Athens
--- a/lib/domains/edu/sage.txt
+++ b/lib/domains/edu/sage.txt
@ -1,2 +1 @@
-Russel Sage College
-Sage Graduate School
+The Sage Colleges
--- a/lib/domains/edu/skku.txt
+++ b/lib/domains/edu/skku.txt
@ -0,0 +1 @@
+SungKyunKwan University
--- a/lib/domains/edu/snhu.txt
+++ b/lib/domains/edu/snhu.txt
@ -0,0 +1 @@
+Southern New Hampshire University
--- a/lib/domains/edu/sunybroome/acad.txt
+++ b/lib/domains/edu/sunybroome/acad.txt
@ -0,0 +1 @@
+SUNY Broome Community College
--- a/lib/domains/edu/ufm.txt
+++ b/lib/domains/edu/ufm.txt
@ -0,0 +1 @@
+Universidad Francisco Marroquin
--- a/lib/domains/edu/upf.txt
+++ b/lib/domains/edu/upf.txt
@ -0,0 +1 @@
+Universitat Pompeu Fabra
--- a/lib/domains/edu/uvu.txt
+++ b/lib/domains/edu/uvu.txt
@ -0,0 +1 @@
+Utah Valley University
--- a/lib/domains/es/iesoleana.txt
+++ b/lib/domains/es/iesoleana.txt
@ -0,0 +1 @@
+IES Oleana
--- a/lib/domains/org/gocommodores.txt
+++ b/lib/domains/org/gocommodores.txt
@ -0,0 +1 @@
+Lafayette Middle School
--- a/lib/domains/org/maltingsacademy.txt
+++ b/lib/domains/org/maltingsacademy.txt
@ -0,0 +1 @@
+Maltings Academy
--- a/lib/domains/pl/debinka.txt
+++ b/lib/domains/pl/debinka.txt
@ -0,0 +1 @@
+Kolegium Edukacyjne PSO
--- a/lib/domains/tlds.txt
+++ b/lib/domains/tlds.txt
@ -39,6 +39,7 @@ ac.zw
 ed.ao
 ed.cr
 ed.jp
+edu
 edu.af
 edu.al
 edu.ar
@ -56,6 +57,7 @@ edu.bs
 edu.bt
 edu.bz
 edu.ck
+edu.cn
 edu.co
 edu.cu
 edu.do
@ -80,7 +82,6 @@ edu.kg
 edu.kh
 edu.kn
 edu.kw
-edu.ky
 edu.kz
 edu.la
 edu.lb
--- a/lib/domains/uk/avonvalleyschool.txt
+++ b/lib/domains/uk/avonvalleyschool.txt
@ -0,0 +1 @@
+The Avon Valley School
				`@ -0,0 +1 @@`
				`Xi’an University of Posts and Telecommunications`
				`@ -0,0 +1 @@`
				`University of Electronic Science and Technology of China，Zhongshan Institute`
				`@ -0,0 +1 @@`
				`National Institute of Technology, Tiruchirappalli`