orbit-basic

0 Fork 0

Files

T

Christophe Vilayphiou fe4c0986e7 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Conflicts:
	Gemfile.lock
	app/controllers/admin/pages_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

2012-02-27 18:56:15 +08:00

app

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-02-27 18:56:15 +08:00

config

remove bulletins_list

2012-02-20 16:23:54 +08:00

lib

merge with master

2012-01-11 20:31:52 +08:00

script

merge with master

2012-01-11 20:31:52 +08:00

test

merge with master

2012-01-11 20:31:52 +08:00

.gitignore

merge with master

2012-01-11 20:31:52 +08:00

announcement.gemspec

merge with master

2012-01-11 20:31:52 +08:00

announcement.json

remove bulletins_list

2012-02-20 16:23:54 +08:00

Gemfile

merge with master

2012-01-11 20:31:52 +08:00

MIT-LICENSE

merge with master

2012-01-11 20:31:52 +08:00

Rakefile

merge with master

2012-01-11 20:31:52 +08:00

README.rdoc

merge with master

2012-01-11 20:31:52 +08:00

README.rdoc

= Announcement

This project rocks and uses MIT-LICENSE.