Connor Turland 8664cc0bd9 Merge branch 'develop' into feature/realtime.video		2016-03-14 11:11:11 +11:00
..
admin	dos2unix on the whole repo	2016-02-05 11:43:15 +08:00
layouts	Merge branch 'develop' into feature/realtime.video	2016-03-14 10:45:16 +11:00
main	main#home view simplify for only unauthenticated users	2016-02-28 18:55:48 +08:00
maps	Merge branch 'develop' into feature/realtime.video	2016-03-14 11:11:11 +11:00
metacode_sets	remove binding.pry	2015-12-03 16:57:26 -05:00
metacodes	show old image on metacode edit form; tweak css of admin area	2016-02-26 14:06:37 +08:00
shared	document synapse cancellation in cheatsheet	2016-02-14 15:19:36 +08:00
topics	remove binding.pry	2015-12-03 16:57:26 -05:00
users	changed user image settings. added mapper profile page	2014-11-25 15:06:30 -05:00