Gonzalo Rodriguez e0ffd7c63e Merge branch 'master' into aspect_nav_rework ... Conflicts: features/posts_from_main_page.feature public/javascripts/aspect-filters.js spec/javascripts/aspect-filters-spec.js		2011-09-27 00:08:05 -03:00
..
controllers	fix build	2011-09-25 13:14:09 -07:00
helpers	added aspect dropdown to the getting started page, renamed the button to be add contact	2011-09-26 17:32:37 -07:00
mailers	fix for 'undefined method 'post' for nil:NilClass' in Mail::AlsoCommented	2011-09-03 16:06:30 -07:00
models	Strip full name considering cases where first or last name omitted	2011-09-20 22:18:35 -03:00
uploaders	MS DG update copyright	2011-09-14 11:23:12 -07:00
views	Merge branch 'master' into aspect_nav_rework	2011-09-27 00:08:05 -03:00