Commit
5f1ae7656ab52611fc83f290eade1d5a3bd3a0ee
Exists in
master
and in
28 other branches
1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies
Merge commit 'refs/merge-requests/37' of git://gitorious.org/noosfero/noosfero i…
…nto merge-requests/37
|
1
| .gitignore |
1
| .gitignore |
|
2
| vendor/rails |
2
| vendor/rails |
|
3
| doc/api |
3
| doc/api |
|
4
| -doc/plugins |
4
| +doc/noosfero/plugins |
|
5
| tmp |
5
| tmp |
|
6
| config/database.yml |
6
| config/database.yml |
|
7
| config/session.secret |
7
| config/session.secret |
