更新了优惠的编辑(未完成) #31

Merged
merged 2 commits into from Apr 11, 2012

Projects

None yet

2 participants

@EternalWind
Collaborator

No description provided.

EternalWind added some commits Apr 11, 2012
@EternalWind EternalWind 更新了优惠的编辑(未完成) 346c2c3
@EternalWind EternalWind Merge branch 'master' of git://github.com/Leeforall/NFCShopping
Conflicts:
	WebSite/WebSite/NFCShoppingWebSite.csproj
	WebSite/WebSite/WebPages/DiscountItemAdd.aspx.cs
3d04b39
@Leeforall Leeforall merged commit 378aa22 into Leeforall:master Apr 11, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment