Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Using theirs
- Loading branch information
1 parent
f7d7abc
commit 30589c6
Showing
55 changed files
with
2,164 additions
and
509 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
*.pyc | ||
.* | ||
dist | ||
MANIFEST | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Samuel Lüscher (philomat) | ||
Jannis Leidel (jezdez) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<<<<<<< HEAD | ||
include LICENSE | ||
include README.md | ||
|
||
recursive-include form_designer/locale * | ||
recursive-include form_designer/media * | ||
recursive-include form_designer/templates * | ||
======= | ||
include AUTHORS | ||
include README.md | ||
include LICENSE | ||
recursive-include form_designer/templates *.html *.txt | ||
recursive-include form_designer/media *.js | ||
recursive-include form_designer/locale *.po *.mo | ||
>>>>>>> 29a8207f09ef53dba714edf377d444702106ad5c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
from south.modelsinspector import add_introspection_rules | ||
|
||
|
||
add_introspection_rules([], ['^form_designer\.pickled_object_field\.PickledObjectField']) | ||
add_introspection_rules([], ['^form_designer\.model_name_field\.ModelNameField']) | ||
add_introspection_rules([], ['^form_designer\.template_field\.TemplateCharField']) | ||
add_introspection_rules([], ['^form_designer\.template_field\.TemplateTextField']) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.