solving merge conflict press.html
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
add a merge tags test
add delete method to tags in categorization view
add a checkbox
Update home.html.erb
22 characters are allowed for maintopic
checkbox does not work yet
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
filter function in admin tags works
set pagination in admin scope to 20
add uncatalogize as params to tag controller and new css for tags in show view
change id topics-cloud to class
the main topic is show without truncate on the show page
add a if statement incase there is no maintopic or tagging in one profile
add the cladd for the topic cloud the correct way
add Profile category scope to the profile controller