Skip to content

Commit

Permalink
Merge branch '1.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
malarzm committed Jan 16, 2016
2 parents 3e39020 + 21c8a94 commit a506bd2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2006-2015 Doctrine Project
Copyright (c) 2006-2016 Doctrine Project

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
2 changes: 1 addition & 1 deletion doctrine-mongo-mapping.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<xs:attribute name="strategy" type="xs:NMTOKEN" default="pushAll" />
<xs:attribute name="inversed-by" type="xs:NMTOKEN" />
<xs:attribute name="mapped-by" type="xs:NMTOKEN" />
<xs:attribute name="repositoryMethod" type="xs:NMTOKEN" />
<xs:attribute name="repository-method" type="xs:NMTOKEN" />
<xs:attribute name="orphan-removal" type="xs:boolean" />
</xs:complexType>

Expand Down

0 comments on commit a506bd2

Please sign in to comment.