первый
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
    many
третий1
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	dump.sql
четвертый1
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
          many
пятый1
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
        many
шестой1
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	dump.sql
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	dump.sql
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	dump.sql
перевел бд в файлы
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
	mysql/ibdata1
	mysql/oranger/db.opt
	mysql/oranger/do77s_acymailing_config.MYD
	mysql/oranger/do77s_acymailing_config.MYI
	mysql/oranger/do77s_acymailing_config.frm
	mysql/oranger/do77s_acymailing_fields.MYD
	mysql/oranger/do77s_acymailing_fields.MYI
	mysql/oranger/do77s_acymailing_fields.frm
	mysql/oranger/do77s_acymailing_filter.MYD
	mysql/oranger/do77s_acymailing_filter.MYI
	mysql/oranger/do77s_acymailing_filter.frm
	mysql/oranger/do77s_acymailing_history.MYD
	mysql/oranger/do77s_acymailing_history.MYI
	mysql/oranger/do77s_acymailing_history.frm
	mysql/oranger/do77s_acymailing_list.MYD
	mysql/oranger/do77s_acymailing_list.MYI
	mysql/oranger/do77s_acymailing_list.frm
	mysql/oranger/do77s_acymailing_listcampaign.MYD
	mysql/oranger/do77s_acymailing_listcampaign.MYI
	mysql/oranger/do77s_acymailing_listcampaign.frm
	mysql/oranger/do77s_acymailing_listmail.MYD
	mysql/oranger/do77s_acymailing_listmail.MYI
	mysql/oranger/do77s_acymailing_listmail.frm
	mysql/oranger/do77s_acymailing_listsub.MYD
	mysql/oranger/do77s_acymailing_listsub.MYI
	mysql/oranger/do77s_acymailing_listsub.frm
	mysql/oranger/do77s_acymailing_mail.MYD
	mysql/oranger/do77s_acymailing_mail.MYI
	mysql/oranger/do77s_acymailing_mail.frm
	mysql/oranger/do77s_acymailing_queue.MYD
	mysql/oranger/do77s_acymailing_queue.MYI
	mysql/oranger/do77s_acymailing_queue.frm
	mysql/oranger/do77s_acymailing_rules.MYD
	mysql/oranger/do77s_acymailing_rules.MYI
	mysql/oranger/do77s_acymailing_rules.frm
	mysql/oranger/do77s_acymailing_stats.MYD
	mysql/oranger/do77s_acymailing_stats.MYI
	mysql/oranger/do77s_acymailing_stats.frm
	mysql/oranger/do77s_acymailing_subscriber.MYD
	mysql/oranger/do77s_acymailing_subscriber.MYI
	mysql/oranger/do77s_acymailing_subscriber.frm
	mysql/oranger/do77s_acymailing_template.MYD
	mysql/oranger/do77s_acymailing_template.MYI
	mysql/oranger/do77s_acymailing_template.frm
	mysql/oranger/do77s_acymailing_url.MYD
	mysql/oranger/do77s_acymailing_url.MYI
	mysql/oranger/do77s_acymailing_url.frm
	mysql/oranger/do77s_acymailing_urlclick.MYD
	mysql/oranger/do77s_acymailing_urlclick.MYI
	mysql/oranger/do77s_acymailing_urlclick.frm
	mysql/oranger/do77s_acymailing_userstats.MYD
	mysql/oranger/do77s_acymailing_userstats.MYI
	mysql/oranger/do77s_acymailing_userstats.frm
	mysql/oranger/do77s_assets.frm
	mysql/oranger/do77s_assets.ibd
	mysql/oranger/do77s_associations.frm
	mysql/oranger/do77s_associations.ibd
	mysql/oranger/do77s_banner_clients.frm
	mysql/oranger/do77s_banner_clients.ibd
	mysql/oranger/do77s_banner_tracks.frm
	mysql/oranger/do77s_banner_tracks.ibd
	mysql/oranger/do77s_banners.frm
	mysql/oranger/do77s_banners.ibd
	mysql/oranger/do77s_categories.frm
	mysql/oranger/do77s_categories.ibd
	mysql/oranger/do77s_contact_details.frm
	mysql/oranger/do77s_contact_details.ibd
	mysql/oranger/do77s_content.frm
	mysql/oranger/do77s_content.ibd
	mysql/oranger/do77s_content_frontpage.frm
	mysql/oranger/do77s_content_frontpage.ibd
	mysql/oranger/do77s_content_rating.frm
	mysql/oranger/do77s_content_rating.ibd
	mysql/oranger/do77s_core_log_searches.frm
	mysql/oranger/do77s_core_log_searches.ibd
	mysql/oranger/do77s_extensions.frm
	mysql/oranger/do77s_extensions.ibd
	mysql/oranger/do77s_finder_filters.frm
	mysql/oranger/do77s_finder_filters.ibd
	mysql/oranger/do77s_finder_links_terms0.frm
	mysql/oranger/do77s_finder_links_terms0.ibd
	mysql/oranger/do77s_finder_links_terms1.frm
	mysql/oranger/do77s_finder_links_terms1.ibd
	mysql/oranger/do77s_finder_links_terms2.frm
	mysql/oranger/do77s_finder_links_terms2.ibd
	mysql/oranger/do77s_finder_links_terms3.frm
	mysql/oranger/do77s_finder_links_terms3.ibd
	mysql/oranger/do77s_finder_links_terms4.frm
	mysql/oranger/do77s_finder_links_terms4.ibd
	mysql/oranger/do77s_finder_links_terms5.frm
	mysql/oranger/do77s_finder_links_terms5.ibd
	mysql/oranger/do77s_finder_links_terms6.frm
	mysql/oranger/do77s_finder_links_terms6.ibd
	mysql/oranger/do77s_finder_links_terms7.frm
	mysql/oranger/do77s_finder_links_terms7.ibd
	mysql/oranger/do77s_finder_links_terms8.frm
	mysql/oranger/do77s_finder_links_terms8.ibd
	mysql/oranger/do77s_finder_links_terms9.frm
	mysql/oranger/do77s_finder_links_terms9.ibd
	mysql/oranger/do77s_finder_links_termsa.frm
	mysql/oranger/do77s_finder_links_termsa.ibd
	mysql/oranger/do77s_finder_links_termsb.frm
	mysql/oranger/do77s_finder_links_termsb.ibd
	mysql/oranger/do77s_finder_links_termsc.frm
	mysql/oranger/do77s_finder_links_termsc.ibd
	mysql/oranger/do77s_finder_links_termsd.frm
	mysql/oranger/do77s_finder_links_termsd.ibd
	mysql/oranger/do77s_finder_links_termse.frm
	mysql/oranger/do77s_finder_links_termse.ibd
	mysql/oranger/do77s_finder_links_termsf.frm
	mysql/oranger/do77s_finder_links_termsf.ibd
	mysql/oranger/do77s_finder_taxonomy.frm
	mysql/oranger/do77s_finder_taxonomy.ibd
	mysql/oranger/do77s_finder_taxonomy_map.frm
	mysql/oranger/do77s_finder_taxonomy_map.ibd
	mysql/oranger/do77s_finder_terms.frm
	mysql/oranger/do77s_finder_terms.ibd
	mysql/oranger/do77s_finder_terms_common.frm
	mysql/oranger/do77s_finder_terms_common.ibd
	mysql/oranger/do77s_finder_tokens.frm
	mysql/oranger/do77s_finder_tokens_aggregate.frm
	mysql/oranger/do77s_finder_types.frm
	mysql/oranger/do77s_finder_types.ibd
	mysql/oranger/do77s_jxtc_ezimg_images.MYD
	mysql/oranger/do77s_jxtc_ezimg_images.MYI
	mysql/oranger/do77s_jxtc_ezimg_images.frm
	mysql/oranger/do77s_jxtc_readinglist.MYD
	mysql/oranger/do77s_jxtc_readinglist.MYI
	mysql/oranger/do77s_jxtc_readinglist.frm
	mysql/oranger/do77s_languages.frm
	mysql/oranger/do77s_languages.ibd
	mysql/oranger/do77s_menu.frm
	mysql/oranger/do77s_menu.ibd
	mysql/oranger/do77s_menu_types.frm
	mysql/oranger/do77s_menu_types.ibd
	mysql/oranger/do77s_messages.frm
	mysql/oranger/do77s_messages.ibd
	mysql/oranger/do77s_messages_cfg.frm
	mysql/oranger/do77s_messages_cfg.ibd
	mysql/oranger/do77s_modules.frm
	mysql/oranger/do77s_modules.ibd
	mysql/oranger/do77s_modules_menu.frm
	mysql/oranger/do77s_modules_menu.ibd
	mysql/oranger/do77s_newsfeeds.frm
	mysql/oranger/do77s_newsfeeds.ibd
	mysql/oranger/do77s_overrider.frm
	mysql/oranger/do77s_overrider.ibd
	mysql/oranger/do77s_redirect_links.frm
	mysql/oranger/do77s_redirect_links.ibd
	mysql/oranger/do77s_schemas.frm
	mysql/oranger/do77s_schemas.ibd
	mysql/oranger/do77s_session.frm
	mysql/oranger/do77s_session.ibd
	mysql/oranger/do77s_template_styles.frm
	mysql/oranger/do77s_template_styles.ibd
	mysql/oranger/do77s_update_sites.frm
	mysql/oranger/do77s_update_sites.ibd
	mysql/oranger/do77s_update_sites_extensions.frm
	mysql/oranger/do77s_update_sites_extensions.ibd
	mysql/oranger/do77s_updates.frm
	mysql/oranger/do77s_updates.ibd
	mysql/oranger/do77s_user_notes.frm
	mysql/oranger/do77s_user_notes.ibd
	mysql/oranger/do77s_user_profiles.frm
	mysql/oranger/do77s_user_profiles.ibd
	mysql/oranger/do77s_user_usergroup_map.frm
	mysql/oranger/do77s_user_usergroup_map.ibd
	mysql/oranger/do77s_usergroups.frm
	mysql/oranger/do77s_usergroups.ibd
	mysql/oranger/do77s_users.frm
	mysql/oranger/do77s_users.ibd
	mysql/oranger/do77s_viewlevels.frm
	mysql/oranger/do77s_viewlevels.ibd
	mysql/oranger/do77s_weblinks.frm
	mysql/oranger/do77s_weblinks.ibd
переместил боковое меню направо
добавил логотип
добавил dump.sql11
Merge branch 'master' of https://github.com/WMTV/oranger

Conflicts:
          many