4 Commits

Include renames

Author	SHA1	Message	Date
Rueshyna	d4df7c82d3	relpace seminar to conference	2013-02-04 18:01:38 +08:00
Rueshyna	703324063e	change journal list json link	2012-11-21 07:37:44 +08:00
Joshua Milton	8c7a0fdf0a	test	2012-06-26 16:59:29 +08:00
Harry Bomrah	7f0267aedd	have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables	2012-06-04 18:00:06 +08:00