Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/static/dist/pyconau2017

5f7e5ee1bd82 18 B text/plain Show Annotation Show as Raw Download as Raw
Nick Seidenman (N6)
Merge branch 'master' into prod

Conflicts:
fixtures/conference.json
fixtures/sites.json
1
../src/pyconau2017
Server instance: kapok.sfconservancy.org-20238 This site is powered by Kallithea 0.6.3, which is © 2010–2020 by various authors & licensed under GPLv3. – Support – Privacy Policy