orbit-4-1

This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

History

Christophe Vilayphiou 5417c6fec0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb		2012-04-12 07:13:13 +08:00
..
app	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-12 07:13:13 +08:00
config	Filter and delete for bulletins	2012-04-12 06:50:36 +08:00
lib	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +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
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
README.rdoc	merge with master	2012-01-11 20:31:52 +08:00
Rakefile	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	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00

= Announcement

This project rocks and uses MIT-LICENSE.