false conflict
transactions work to date
Merge branch 'dev' of razorit.beanstalkapp.com:/zuha into dev
sites update
ignore
Updating Look and Feel Default
submods
subs
sites
default template update
transactions plugin development
transactions development
Merge branch 'dev' of razorit.beanstalkapp.com:/zuha into dev
fake sites folder conflict?
further checkout dev
Updated Twitter Bootstrap for Admin
New Theme for the Admin
transactions development
Updated Admin Theme
Dashboard Theme Updates