Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Dzul authored and Alex Dzul committed Feb 28, 2015
2 parents 32f1571 + b3a112e commit aaa314d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-
__author__ = 'alex'

0 comments on commit aaa314d

Please sign in to comment.