Merge branch '4.0'

This commit is contained in:
Dan Stillman 2016-01-20 01:23:02 -05:00
commit 3071b8093b
40 changed files with 278 additions and 234 deletions

View file

@ -454,6 +454,7 @@
"unisa-harvard": "university-of-south-australia-harvard-2011",
"unisa-harvard3": "university-of-south-australia-harvard-2011",
"universite-laval-com": "universite-laval-departement-dinformation-et-de-communication",
"university-college-lillebaelt-vancouver-en": "university-college-lillebaelt-vancouver",
"university-of-melbourne": "harvard-the-university-of-melbourne",
"uqam-universite-du-quebec-a-montreal": "universite-du-quebec-a-montreal",
"user-modeling-and-useradapted-interaction": "user-modeling-and-user-adapted-interaction",

View file

@ -1 +1 @@
2015-09-30 16:30:00
2015-12-08 12:45:00