#2
Merge branch 'master' of https://github.com/insanesoft/insanebox
search node to add class in masonry
#2
Merge branch 'master' into imap_oauth_2.0

Conflicts:
	app/views/inbox/show.html.erb
#1 #2 #3