Skip to content
Commit f8470b29 authored by shadcn's avatar shadcn
Browse files

Merge branch '7.x-1.x' of github.com:openrestaurant/restaurant into 7.x-1.x

# Conflicts:
#	README.md
#	drupal-org.make
parents f2cc9ae4 7354920b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment