Sacha Greif c7fbb490f3 Merge branch 'jshimko-users-list' into devel ... Conflicts: .meteor/versions		2015-03-10 10:47:39 +09:00
..
.finished-upgraders	updating to Meteor 1.0	2014-11-17 09:35:29 +09:00
.gitignore	Add meteorite to .gitignore	2012-09-24 19:45:22 +02:00
.id	working on daily view	2014-08-27 10:23:56 +09:00
cordova-plugins	fix comment publication bug	2014-09-19 20:00:22 +09:00
packages	Merge branch 'jshimko-users-list' into devel	2015-03-10 10:47:39 +09:00
platforms	updating to Meteor 1.0	2014-11-17 09:35:29 +09:00
release	updating to Meteor 1.0.3.2 and pinning Autoform version	2015-03-10 09:32:00 +09:00
versions	Merge branch 'jshimko-users-list' into devel	2015-03-10 10:47:39 +09:00