Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into allow-no-nickname

Browse source 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
This commit is contained in:
wvengen 2013-11-18 11:42:49 +01:00
commit 66ac3be81f
63 changed files with 428 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

1
db/migrate/20090325175756_create_pages.rb → db/migrate/20090325175756_create_pages.foodsoft_wiki_engine.rb
View file

@ -1,3 +1,4 @@
# This migration comes from foodsoft_wiki_engine (originally 20090325175756)
class CreatePages < ActiveRecord::Migration
def self.up
create_table :pages do |t|