Merge branch 'wiki'

2009-08-15 17:24:08 +02:00 · 2009-08-15 17:24:08 +02:00 · e75a42d509
commit e75a42d509
parent 8d243c8e60 6fae1e8b64
146 changed files with 6300 additions and 261 deletions
--- a/app/models/article_category.rb
+++ b/app/models/article_category.rb
@ -2,7 +2,7 @@
 #
 # Table name: article_categories
 #
-#  id          :integer(4)      not null, primary key
+#  id          :integer         not null, primary key
 #  name        :string(255)     default(""), not null
 #  description :string(255)
 #