Pokaż
Ignoruj:
Data:
2009-11-24 12:21:39 (16 years ago)
Autor:
sylwek
Opis:

Re #195 merged with latest trunk

Lokalizacja:
branches/Emisje
Pliki:
2 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/Emisje

    • Property svn:mergeinfo

      •  

        old new  
         1/branches/Abonament:701-884 
        12/branches/AutoShopper:815-818 
        23/branches/ReklamaReorganizacja:568-731 
        34/tags/BazaReklam_1.1.28:831 
        4 /trunk:774-868 
         5/trunk:774-893 

  • branches/Emisje/eCard/eCardMVC/Platnosci/Views/Merchant/Merchant.aspx

    r866 r895  
    1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Glowna.Master" Inherits="Platnosci.Views.PlatnosciViews<Platnosci.Models.MerchantViewData>" %> 
     1<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Glowna.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.MerchantViewData>" %> 
    22 
    33<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">